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 /arch | |
| parent | ccaeeec5294b1be89264c2eb6026d7a0eecb61c0 (diff) | |
| parent | 5cc5ed7a668dcfb62c02f380c7cca9c808242ed0 (diff) | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/include/asm/fpsimdmacros.h | 8 | ||||
| -rw-r--r-- | arch/arm64/include/asm/memory.h | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm64/include/asm/fpsimdmacros.h b/arch/arm64/include/asm/fpsimdmacros.h index cdf6a35e3994..cda81d009c9b 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 b8d726f951ae..56d1e6f14861 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 */ |