Skip to content

Commit ede3241

Browse files
brooniectmarinas
authored andcommitted
arm64: entry: Add SYM_CODE annotation for __bad_stack
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 <[email protected]> Acked-by: Will Deacon <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]>
1 parent 312b710 commit ede3241

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

arch/arm64/kernel/entry.S

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,12 +517,13 @@ SYM_CODE_START(vectors)
517517
SYM_CODE_END(vectors)
518518

519519
#ifdef CONFIG_VMAP_STACK
520+
SYM_CODE_START_LOCAL(__bad_stack)
520521
/*
521522
* We detected an overflow in kernel_ventry, which switched to the
522523
* overflow stack. Stash the exception regs, and head to our overflow
523524
* handler.
524525
*/
525-
__bad_stack:
526+
526527
/* Restore the original x0 value */
527528
mrs x0, tpidrro_el0
528529

@@ -542,6 +543,7 @@ __bad_stack:
542543
/* Time to die */
543544
bl handle_bad_stack
544545
ASM_BUG()
546+
SYM_CODE_END(__bad_stack)
545547
#endif /* CONFIG_VMAP_STACK */
546548

547549

0 commit comments

Comments
 (0)