From: Julien Thierry Date: Thu, 9 Jan 2020 16:02:59 +0000 (+0000) Subject: arm64: entry: Avoid empty alternatives entries X-Git-Tag: v5.6-rc1~208^2~4^9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=108eae2d4d10cd29f7af75d45e38bc3bcde24a7c;p=thirdparty%2Fkernel%2Flinux.git 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 Signed-off-by: Julien Thierry Signed-off-by: Will Deacon --- diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 7c6a0a41676f8..605bb7cbe499b 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