aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-15 13:43:14 +0100
committerMark Brown <broonie@linaro.org>2013-09-15 13:43:14 +0100
commitcb03293a043ab9bda850fe143062bd304a9e2376 (patch)
treeb095c468c7b2b2b8111ce3aefb5c36fc52a0b86d
parentfe1674924bbf46c731108a920bd2f28bdf102e28 (diff)
parentabd61217e46b3edbaf3dd615d215f3d2cd8c79e3 (diff)
downloadvexpress-lsk-cb03293a043ab9bda850fe143062bd304a9e2376.tar.gz
Merge remote-tracking branch 'lsk/linux-linaro-lsk' into linux-linaro-lsk
-rw-r--r--arch/arm/kernel/head.S1
-rw-r--r--arch/arm/kernel/smp.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 8bac553fe21..2725c87fade 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -342,7 +342,6 @@ __turn_mmu_on_loc:
.long __turn_mmu_on_end
#if defined(CONFIG_SMP)
- __CPUINIT
ENTRY(secondary_startup)
/*
* Common entry point for secondary CPUs.
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index dc05ca77963..46e8ab384e6 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -57,7 +57,7 @@ struct secondary_data secondary_data;
* control for which core is the next to come out of the secondary
* boot "holding pen"
*/
-volatile int __cpuinitdata pen_release = -1;
+volatile int pen_release = -1;
enum ipi_msg_type {
IPI_WAKEUP,