diff options
| author | Alex Shi <alex.shi@linaro.org> | 2013-09-12 13:01:28 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2013-09-12 13:01:28 +0800 |
| commit | 15812f79511f4b94ee42f35c9095ba0c0cb5204c (patch) | |
| tree | 6718038d09db8843d34149601b341b95d7d4e460 | |
| parent | ed9d23700ee7847c354c0edd6d4da358bad48b7d (diff) | |
| parent | abd61217e46b3edbaf3dd615d215f3d2cd8c79e3 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
| -rw-r--r-- | arch/arm/kernel/head.S | 1 | ||||
| -rw-r--r-- | arch/arm/kernel/smp.c | 2 |
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 84d55da02e6..a666911fbe2 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, |