aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2014-01-14 18:10:43 +0800
committerAlex Shi <alex.shi@linaro.org>2014-01-14 18:10:43 +0800
commit97a3f598db7ca886011296d9e364e20ab4d6e372 (patch)
tree4401d5993034ea6ed002cf9e474c2841c56bb91c /arch
parent60d29b4f9bf5466c1d6eccac414765b7ac2e8eb4 (diff)
parent98eba195f9f6efff2259f17e2261209e47529ab1 (diff)
downloadlinaro-lsk-97a3f598db7ca886011296d9e364e20ab4d6e372.tar.gz
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'arch')
-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 87340fd5393..35085d66459 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -156,6 +156,11 @@ asmlinkage void __cpuinit secondary_start_kernel(void)
smp_store_cpu_info(cpu);
/*
+ * Enable GIC and timers.
+ */
+ notify_cpu_starting(cpu);
+
+ /*
* OK, now it's safe to let the boot CPU continue. Wait for
* the CPU migration code to notice that the CPU is online
* before we continue.
@@ -163,11 +168,6 @@ asmlinkage void __cpuinit secondary_start_kernel(void)
set_cpu_online(cpu, true);
complete(&cpu_running);
- /*
- * Enable GIC and timers.
- */
- notify_cpu_starting(cpu);
-
local_irq_enable();
local_fiq_enable();