aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm64/kernel/smp.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index 5b4ddbd653c3..3abb9e797dd4 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -146,6 +146,11 @@ asmlinkage void secondary_start_kernel(void)
146 cpu_ops[cpu]->cpu_postboot(); 146 cpu_ops[cpu]->cpu_postboot();
147 147
148 /* 148 /*
149 * Enable GIC and timers.
150 */
151 notify_cpu_starting(cpu);
152
153 /*
149 * OK, now it's safe to let the boot CPU continue. Wait for 154 * OK, now it's safe to let the boot CPU continue. Wait for
150 * the CPU migration code to notice that the CPU is online 155 * the CPU migration code to notice that the CPU is online
151 * before we continue. 156 * before we continue.
@@ -153,11 +158,6 @@ asmlinkage void secondary_start_kernel(void)
153 set_cpu_online(cpu, true); 158 set_cpu_online(cpu, true);
154 complete(&cpu_running); 159 complete(&cpu_running);
155 160
156 /*
157 * Enable GIC and timers.
158 */
159 notify_cpu_starting(cpu);
160
161 local_irq_enable(); 161 local_irq_enable();
162 local_fiq_enable(); 162 local_fiq_enable();
163 163