Commit 65180649 authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'for-next/misc' into for-next/core 

* for-next/misc:
  arm64: memory: remove duplicated include
  arm64: Delete the zero_za macro
  Documentation/arch/arm64: Fix typo
parents ccaeeec5 5cc5ed7a

Documentation/arch/arm64/arm-acpi.rst

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ When an Arm system boots, it can either have DT information, ACPI tables, 
or in some very unusual cases, both.  If no command line parameters are used,

the kernel will try to use DT for device enumeration; if there is no DT

present, the kernel will try to use ACPI tables, but only if they are present.

In neither is available, the kernel will not boot.  If acpi=force is used

If neither is available, the kernel will not boot.  If acpi=force is used

on the command line, the kernel will attempt to use ACPI tables first, but

fall back to DT if there are no ACPI tables present.  The basic idea is that

the kernel will not fail to boot unless it absolutely has no other choice.

arch/arm64/include/asm/fpsimdmacros.h

+0 −8
Original line number Diff line number Diff line
@@ -242,14 +242,6 @@ 
		| (\nx << 5)

.endm



/*

 * Zero the entire ZA array

 *	ZERO ZA

 */

.macro zero_za

	.inst 0xc00800ff

.endm



.macro __for from:req, to:req

	.if (\from) == (\to)

		_for__body %\from

arch/arm64/include/asm/memory.h

+0 −1
Original line number Diff line number Diff line
@@ -405,6 +405,5 @@ void dump_mem_limit(void); 
#define INIT_MEMBLOCK_MEMORY_REGIONS	(INIT_MEMBLOCK_REGIONS * 8)

#endif



#include <asm-generic/memory_model.h>



#endif /* __ASM_MEMORY_H */