]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
arm64: entry: Add SYM_CODE annotation for __bad_stack
authorMark Brown <broonie@kernel.org>
Wed, 4 Aug 2021 18:17:10 +0000 (19:17 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Fri, 6 Aug 2021 10:12:45 +0000 (11:12 +0100)
When converting arm64 to modern assembler annotations __bad_stack was left
as a raw local label without annotations. While this will have little if
any practical impact at present it may cause issues in the future if we
start using the annotations for things like reliable stack trace. Add
SYM_CODE annotations to fix this.

Signed-off-by: Mark Brown <broonie@kernel.org>
Acked-by: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20210804181710.19059-1-broonie@kernel.org
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
arch/arm64/kernel/entry.S

index 863d44f730282f043e72c6cfb41ad81153b85740..fea118e68d51ee64ac9e3539f018e20c936b9bfa 100644 (file)
@@ -517,12 +517,13 @@ SYM_CODE_START(vectors)
 SYM_CODE_END(vectors)
 
 #ifdef CONFIG_VMAP_STACK
+SYM_CODE_START_LOCAL(__bad_stack)
        /*
         * We detected an overflow in kernel_ventry, which switched to the
         * overflow stack. Stash the exception regs, and head to our overflow
         * handler.
         */
-__bad_stack:
+
        /* Restore the original x0 value */
        mrs     x0, tpidrro_el0
 
@@ -542,6 +543,7 @@ __bad_stack:
        /* Time to die */
        bl      handle_bad_stack
        ASM_BUG()
+SYM_CODE_END(__bad_stack)
 #endif /* CONFIG_VMAP_STACK */