diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2011-09-08 13:15:22 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-14 11:14:57 +0200 |
| commit | 44ea349f5b7e0b4865de9ca6b4437c746eede40c (patch) | |
| tree | fc6b41a24bc610dc7afedc3117fd84a6f3b6b2fa /arch/arm/mach-msm/hotplug.c | |
| parent | 06853ae475e1386d6d11d139ba7bf2c97b3d1768 (diff) | |
| download | op-kernel-dev-44ea349f5b7e0b4865de9ca6b4437c746eede40c.zip op-kernel-dev-44ea349f5b7e0b4865de9ca6b4437c746eede40c.tar.gz | |
ARM: SoC: convert MSM to SMP operations
Convert MSM SMP platforms to use struct smp_operations to provide
their SMP and CPU hotplug operations.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
Cc: David Brown <davidb@codeaurora.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-msm/hotplug.c')
| -rw-r--r-- | arch/arm/mach-msm/hotplug.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c index a446fc1..fedaa25 100644 --- a/arch/arm/mach-msm/hotplug.c +++ b/arch/arm/mach-msm/hotplug.c @@ -13,6 +13,8 @@ #include <asm/cacheflush.h> #include <asm/smp_plat.h> +#include "core.h" + extern volatile int pen_release; static inline void cpu_enter_lowpower(void) @@ -57,17 +59,12 @@ static inline void platform_do_lowpower(unsigned int cpu) } } -int platform_cpu_kill(unsigned int cpu) -{ - return 1; -} - /* * platform-specific code to shutdown a CPU * * Called with IRQs disabled */ -void platform_cpu_die(unsigned int cpu) +void __ref msm_cpu_die(unsigned int cpu) { /* * we're ready for shutdown now, so do it @@ -81,12 +78,3 @@ void platform_cpu_die(unsigned int cpu) */ cpu_leave_lowpower(); } - -int platform_cpu_disable(unsigned int cpu) -{ - /* - * we don't allow CPU 0 to be shutdown (it is still too special - * e.g. clock tick interrupts) - */ - return cpu == 0 ? -EPERM : 0; -} |
