diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2012-09-05 10:36:18 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-14 05:14:59 -0400 |
commit | 7ad71b61e744e7c565eec9e7aa734b0c42d93b16 (patch) | |
tree | 9698f530932cac6db43006c11b06eda02b3a03c8 /arch/arm/mach-highbank/hotplug.c | |
parent | a62580e58065dc00430b16ced6e7a00837b8323f (diff) |
ARM: SoC: convert highbank to SMP operations
Convert the highbank platform to use struct smp_operations to provide
its SMP and CPU hotplug operations.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-highbank/hotplug.c')
-rw-r--r-- | arch/arm/mach-highbank/hotplug.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/arm/mach-highbank/hotplug.c b/arch/arm/mach-highbank/hotplug.c index 977cebbea580..2c1b8c3c8e45 100644 --- a/arch/arm/mach-highbank/hotplug.c +++ b/arch/arm/mach-highbank/hotplug.c | |||
@@ -24,16 +24,11 @@ | |||
24 | 24 | ||
25 | extern void secondary_startup(void); | 25 | extern void secondary_startup(void); |
26 | 26 | ||
27 | int platform_cpu_kill(unsigned int cpu) | ||
28 | { | ||
29 | return 1; | ||
30 | } | ||
31 | |||
32 | /* | 27 | /* |
33 | * platform-specific code to shutdown a CPU | 28 | * platform-specific code to shutdown a CPU |
34 | * | 29 | * |
35 | */ | 30 | */ |
36 | void platform_cpu_die(unsigned int cpu) | 31 | void __ref highbank_cpu_die(unsigned int cpu) |
37 | { | 32 | { |
38 | flush_cache_all(); | 33 | flush_cache_all(); |
39 | 34 | ||
@@ -45,12 +40,3 @@ void platform_cpu_die(unsigned int cpu) | |||
45 | /* We should never return from idle */ | 40 | /* We should never return from idle */ |
46 | panic("highbank: cpu %d unexpectedly exit from shutdown\n", cpu); | 41 | panic("highbank: cpu %d unexpectedly exit from shutdown\n", cpu); |
47 | } | 42 | } |
48 | |||
49 | int platform_cpu_disable(unsigned int cpu) | ||
50 | { | ||
51 | /* | ||
52 | * CPU0 should not be shut down via hotplug. cpu_idle can WFI | ||
53 | * or a proper shutdown or hibernate should be used. | ||
54 | */ | ||
55 | return cpu == 0 ? -EPERM : 0; | ||
56 | } | ||