summaryrefslogtreecommitdiff
path: root/arch/mips/kernel/smp.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2022-03-30 21:14:18 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2022-03-30 21:14:18 -0700
commit5710faba8a2a15349c9001bd4b2cd958e56c90fa (patch)
tree80694ac211cac1b2347c3c905b38d86139dc51c1 /arch/mips/kernel/smp.c
parent5600f6986628dde8881734090588474f54a540a8 (diff)
parenta949087c2285c8de4f0f204cab2d4eece9d929a2 (diff)
downloadlinux-5710faba8a2a15349c9001bd4b2cd958e56c90fa.tar.gz
linux-5710faba8a2a15349c9001bd4b2cd958e56c90fa.tar.bz2
linux-5710faba8a2a15349c9001bd4b2cd958e56c90fa.zip
Merge branch 'next' into for-linus
Prepare input updates for 5.18 merge window.
Diffstat (limited to 'arch/mips/kernel/smp.c')
-rw-r--r--arch/mips/kernel/smp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index d542fb7af3ba..1986d1309410 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -351,6 +351,9 @@ asmlinkage void start_secondary(void)
cpu = smp_processor_id();
cpu_data[cpu].udelay_val = loops_per_jiffy;
+ set_cpu_sibling_map(cpu);
+ set_cpu_core_map(cpu);
+
cpumask_set_cpu(cpu, &cpu_coherent_mask);
notify_cpu_starting(cpu);
@@ -362,9 +365,6 @@ asmlinkage void start_secondary(void)
/* The CPU is running and counters synchronised, now mark it online */
set_cpu_online(cpu, true);
- set_cpu_sibling_map(cpu);
- set_cpu_core_map(cpu);
-
calculate_cpu_foreign_map();
/*