Skip to content

Commit c4a5699

Browse files
leitaowilldeacon
authored andcommitted
arm64: remove CONFIG_VMAP_STACK conditionals from irq stack setup
With VMAP_STACK always enabled on arm64, drop the CONFIG_VMAP_STACK checks and legacy irq stack allocation from arch/arm64/kernel/irq.c. The code now unconditionally uses the VMAP_STACK path for irq stack initialization, simplifying the logic. 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 0909c71 commit c4a5699

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

arch/arm64/kernel/irq.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ static void init_irq_scs(void)
5151
scs_alloc(early_cpu_to_node(cpu));
5252
}
5353

54-
#ifdef CONFIG_VMAP_STACK
5554
static void __init init_irq_stacks(void)
5655
{
5756
int cpu;
@@ -62,18 +61,6 @@ static void __init init_irq_stacks(void)
6261
per_cpu(irq_stack_ptr, cpu) = p;
6362
}
6463
}
65-
#else
66-
/* irq stack only needs to be 16 byte aligned - not IRQ_STACK_SIZE aligned. */
67-
DEFINE_PER_CPU_ALIGNED(unsigned long [IRQ_STACK_SIZE/sizeof(long)], irq_stack);
68-
69-
static void init_irq_stacks(void)
70-
{
71-
int cpu;
72-
73-
for_each_possible_cpu(cpu)
74-
per_cpu(irq_stack_ptr, cpu) = per_cpu(irq_stack, cpu);
75-
}
76-
#endif
7764

7865
#ifndef CONFIG_PREEMPT_RT
7966
static void ____do_softirq(struct pt_regs *regs)

0 commit comments

Comments
 (0)