diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2012-06-12 11:16:27 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-14 11:15:01 +0200 |
commit | 28e8e29c616f947348cc66bea684d0035c76021a (patch) | |
tree | e60188267452962f522f5c94ca77546257c8466a /arch/arm/mach-spear13xx | |
parent | ac6c7998712d55bd15aa2dd5ae85f5988c0cb526 (diff) | |
download | blackbird-op-linux-28e8e29c616f947348cc66bea684d0035c76021a.tar.gz blackbird-op-linux-28e8e29c616f947348cc66bea684d0035c76021a.zip |
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-spear13xx')
-rw-r--r-- | arch/arm/mach-spear13xx/hotplug.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-spear13xx/platsmp.c | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-spear13xx/hotplug.c b/arch/arm/mach-spear13xx/hotplug.c index 485fd4367bb1..a7d2dd11a4f2 100644 --- a/arch/arm/mach-spear13xx/hotplug.c +++ b/arch/arm/mach-spear13xx/hotplug.c @@ -17,8 +17,6 @@ #include <asm/cp15.h> #include <asm/smp_plat.h> -extern volatile int pen_release; - static inline void cpu_enter_lowpower(void) { unsigned int v; diff --git a/arch/arm/mach-spear13xx/platsmp.c b/arch/arm/mach-spear13xx/platsmp.c index 806343c7b5d8..2eaa3fa7b432 100644 --- a/arch/arm/mach-spear13xx/platsmp.c +++ b/arch/arm/mach-spear13xx/platsmp.c @@ -21,11 +21,6 @@ #include <mach/spear.h> #include <mach/generic.h> -/* - * control for which core is the next to come out of the secondary - * boot "holding pen" - */ -volatile int __cpuinitdata pen_release = -1; static DEFINE_SPINLOCK(boot_lock); static void __iomem *scu_base = IOMEM(VA_SCU_BASE); |