diff options
| author | Will Deacon | 2024-01-04 12:27:55 +0000 |
|---|---|---|
| committer | Will Deacon | 2024-01-04 12:27:55 +0000 |
| commit | 3b47bd8fed0446f4cc89e66d7a532b5f8b6633f3 (patch) | |
| tree | 9741400cebddc121f003ac7452d7285d914e06fa /arch | |
| parent | 65180649fa25695e2b156b30965cefde7a033575 (diff) | |
| parent | 7b1a09e44dc64f4f5930659b6d14a27183c00705 (diff) | |
Merge branch 'for-next/mm' into for-next/core
* for-next/mm:
arm64: irq: set the correct node for shadow call stack
arm64: irq: set the correct node for VMAP stack
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kernel/irq.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm64/kernel/irq.c b/arch/arm64/kernel/irq.c index 6ad5c6ef5329..85087e2df564 100644 --- a/arch/arm64/kernel/irq.c +++ b/arch/arm64/kernel/irq.c @@ -22,6 +22,7 @@ #include <linux/vmalloc.h> #include <asm/daifflags.h> #include <asm/exception.h> +#include <asm/numa.h> #include <asm/softirq_stack.h> #include <asm/stacktrace.h> #include <asm/vmap_stack.h> @@ -47,17 +48,17 @@ static void init_irq_scs(void) for_each_possible_cpu(cpu) per_cpu(irq_shadow_call_stack_ptr, cpu) = - scs_alloc(cpu_to_node(cpu)); + scs_alloc(early_cpu_to_node(cpu)); } #ifdef CONFIG_VMAP_STACK -static void init_irq_stacks(void) +static void __init init_irq_stacks(void) { int cpu; unsigned long *p; for_each_possible_cpu(cpu) { - p = arch_alloc_vmap_stack(IRQ_STACK_SIZE, cpu_to_node(cpu)); + p = arch_alloc_vmap_stack(IRQ_STACK_SIZE, early_cpu_to_node(cpu)); per_cpu(irq_stack_ptr, cpu) = p; } } |