summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2012-06-12 11:16:27 +0100
committerArnd Bergmann <arnd@arndb.de>2012-09-14 11:15:01 +0200
commit28e8e29c616f947348cc66bea684d0035c76021a (patch)
treee60188267452962f522f5c94ca77546257c8466a /arch/arm/mach-ux500
parentac6c7998712d55bd15aa2dd5ae85f5988c0cb526 (diff)
downloadblackbird-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-ux500')
-rw-r--r--arch/arm/mach-ux500/hotplug.c2
-rw-r--r--arch/arm/mach-ux500/platsmp.c6
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-ux500/hotplug.c b/arch/arm/mach-ux500/hotplug.c
index b8e4d9ed62d8..2f6af259015d 100644
--- a/arch/arm/mach-ux500/hotplug.c
+++ b/arch/arm/mach-ux500/hotplug.c
@@ -17,8 +17,6 @@
#include <mach/setup.h>
-extern volatile int pen_release;
-
/*
* platform-specific code to shutdown a CPU
*
diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c
index b6f4e0e787ec..d60873ee38bf 100644
--- a/arch/arm/mach-ux500/platsmp.c
+++ b/arch/arm/mach-ux500/platsmp.c
@@ -28,12 +28,6 @@
extern void u8500_secondary_startup(void);
/*
- * control for which core is the next to come out of the secondary
- * boot "holding pen"
- */
-volatile int pen_release = -1;
-
-/*
* Write pen_release in a way that is guaranteed to be visible to all
* observers, irrespective of whether they're taking part in coherency
* or not. This is necessary for the hotplug code to work reliably.
OpenPOWER on IntegriCloud