diff options
| author | Will Deacon <will@kernel.org> | 2024-01-04 12:27:49 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2024-01-04 12:27:49 +0000 |
| commit | 65180649fa25695e2b156b30965cefde7a033575 (patch) | |
| tree | 1fe077abe004ae10c704548a08f547fa3cb54714 | |
| parent | ccaeeec5294b1be89264c2eb6026d7a0eecb61c0 (diff) | |
| parent | 5cc5ed7a668dcfb62c02f380c7cca9c808242ed0 (diff) | |
| download | misc-65180649fa25695e2b156b30965cefde7a033575.tar.gz | |
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
| -rw-r--r-- | Documentation/arch/arm64/arm-acpi.rst | 2 | ||||
| -rw-r--r-- | arch/arm64/include/asm/fpsimdmacros.h | 8 | ||||
| -rw-r--r-- | arch/arm64/include/asm/memory.h | 1 |
3 files changed, 1 insertions, 10 deletions
diff --git a/Documentation/arch/arm64/arm-acpi.rst b/Documentation/arch/arm64/arm-acpi.rst index a46c34fa96044c..e59e4505d0d999 100644 --- a/Documentation/arch/arm64/arm-acpi.rst +++ b/Documentation/arch/arm64/arm-acpi.rst @@ -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. diff --git a/arch/arm64/include/asm/fpsimdmacros.h b/arch/arm64/include/asm/fpsimdmacros.h index cdf6a35e399440..cda81d009c9bd7 100644 --- a/arch/arm64/include/asm/fpsimdmacros.h +++ b/arch/arm64/include/asm/fpsimdmacros.h @@ -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 diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index b8d726f951ae51..56d1e6f14861df 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -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 */ |