aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2012-06-12 06:16:27 -0400
committerArnd Bergmann <arnd@arndb.de>2012-09-14 05:15:01 -0400
commit28e8e29c616f947348cc66bea684d0035c76021a (patch)
treee60188267452962f522f5c94ca77546257c8466a /arch/arm/mach-msm
parentac6c7998712d55bd15aa2dd5ae85f5988c0cb526 (diff)
ARM: consolidate pen_release instead of having per platform definitions
Almost each SMP platform defines pen_release to manage booting secondary CPUs. This of course clashes with the single zImage effort. Add the pen_release definition to the ARM SMP code, and remove all others. This should only be used by platforms which lack any kind of CPU power management... Reported-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Acked-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-msm')
-rw-r--r--arch/arm/mach-msm/hotplug.c2
-rw-r--r--arch/arm/mach-msm/platsmp.c5
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c
index fedaa25b2935..002ac1e47235 100644
--- a/arch/arm/mach-msm/hotplug.c
+++ b/arch/arm/mach-msm/hotplug.c
@@ -15,8 +15,6 @@
15 15
16#include "core.h" 16#include "core.h"
17 17
18extern volatile int pen_release;
19
20static inline void cpu_enter_lowpower(void) 18static inline void cpu_enter_lowpower(void)
21{ 19{
22 /* Just flush the cache. Changing the coherency is not yet 20 /* Just flush the cache. Changing the coherency is not yet
diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c
index ba3c4b0d523d..57af32ef75ed 100644
--- a/arch/arm/mach-msm/platsmp.c
+++ b/arch/arm/mach-msm/platsmp.c
@@ -35,11 +35,6 @@
35#define GIC_PPI_EDGE_MASK 0xFFFFD7FF 35#define GIC_PPI_EDGE_MASK 0xFFFFD7FF
36 36
37extern void msm_secondary_startup(void); 37extern void msm_secondary_startup(void);
38/*
39 * control for which core is the next to come out of the secondary
40 * boot "holding pen".
41 */
42volatile int pen_release = -1;
43 38
44static DEFINE_SPINLOCK(boot_lock); 39static DEFINE_SPINLOCK(boot_lock);
45 40