Skip to content

Commit e5692bb

Browse files
leitaowilldeacon
authored andcommitted
arm64: remove CONFIG_VMAP_STACK conditionals from traps overflow stack
With VMAP_STACK now always enabled on arm64, remove the CONFIG_VMAP_STACK checks from overflow stack definitions and related code in arch/arm64/kernel/traps.c. The overflow_stack and panic_bad_stack() logic are now unconditionally included, simplifying the source and matching the mandatory stack model. Signed-off-by: Breno Leitao <[email protected]> Acked-by: Ard Biesheuvel <[email protected]> Acked-by: Mark Rutland <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent c4a5699 commit e5692bb

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

arch/arm64/kernel/traps.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -894,8 +894,6 @@ void bad_el0_sync(struct pt_regs *regs, int reason, unsigned long esr)
894894
"Bad EL0 synchronous exception");
895895
}
896896

897-
#ifdef CONFIG_VMAP_STACK
898-
899897
DEFINE_PER_CPU(unsigned long [OVERFLOW_STACK_SIZE/sizeof(long)], overflow_stack)
900898
__aligned(16);
901899

@@ -927,7 +925,6 @@ void __noreturn panic_bad_stack(struct pt_regs *regs, unsigned long esr, unsigne
927925
nmi_panic(NULL, "kernel stack overflow");
928926
cpu_park_loop();
929927
}
930-
#endif
931928

932929
void __noreturn arm64_serror_panic(struct pt_regs *regs, unsigned long esr)
933930
{

0 commit comments

Comments
 (0)