diff options
| author |   Julien Thierry <jthierry@redhat.com> | 2020-01-09 16:02:59 +0000 |
|---|---|---|
| committer |   Will Deacon <will@kernel.org> | 2020-01-21 09:55:18 +0000 |
| commit | 108eae2d4d10cd29f7af75d45e38bc3bcde24a7c (patch) | |
| tree | 11711c1c5bcff82c8ca5326250acd6b833519d33 /arch | |
| parent | arm64: Kconfig: select HAVE_FUTEX_CMPXCHG (diff) | |
| download | linux-dev-108eae2d4d10cd29f7af75d45e38bc3bcde24a7c.tar.xz linux-dev-108eae2d4d10cd29f7af75d45e38bc3bcde24a7c.zip | |
arm64: entry: Avoid empty alternatives entries
kernel_ventry will create alternative entries to potentially replace
0 instructions with 0 instructions for EL1 vectors. While this does not
cause an issue, it pointlessly takes up some bytes in the alternatives
section.
Do not generate such entries.
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Julien Thierry <jthierry@redhat.com>
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kernel/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 7c6a0a41676f..605bb7cbe499 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -60,16 +60,16 @@ .macro kernel_ventry, el, label, regsize = 64 .align 7 #ifdef CONFIG_UNMAP_KERNEL_AT_EL0 -alternative_if ARM64_UNMAP_KERNEL_AT_EL0 .if \el == 0 +alternative_if ARM64_UNMAP_KERNEL_AT_EL0 .if \regsize == 64 mrs x30, tpidrro_el0 msr tpidrro_el0, xzr .else mov x30, xzr .endif - .endif alternative_else_nop_endif + .endif #endif sub sp, sp, #S_FRAME_SIZE |