diff options
| author | Magnus Damm <damm@opensource.se> | 2011-12-28 16:47:16 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-09 10:37:24 +0900 |
| commit | 8b306796995609c281f6d32b3cbaa814551ad5ac (patch) | |
| tree | cc15f092c9493d58004920855ac76fa691e71bd8 /arch | |
| parent | f0eab3889e4b5b71e1609c9850f652f06a812cf5 (diff) | |
| download | linux-stable-8b306796995609c281f6d32b3cbaa814551ad5ac.tar.gz linux-stable-8b306796995609c281f6d32b3cbaa814551ad5ac.tar.bz2 linux-stable-8b306796995609c281f6d32b3cbaa814551ad5ac.zip | |
ARM: mach-shmobile: Allow SoC specific CPU kill code
Add the function shmobile_platform_kill_cpu() to allow
SoC specific code to tie in their CPU shutdown code.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-shmobile/hotplug.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/common.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/platsmp.c | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/hotplug.c b/arch/arm/mach-shmobile/hotplug.c index 238a0d97d2d5..aee3a1088a5a 100644 --- a/arch/arm/mach-shmobile/hotplug.c +++ b/arch/arm/mach-shmobile/hotplug.c @@ -12,10 +12,11 @@ #include <linux/kernel.h> #include <linux/errno.h> #include <linux/smp.h> +#include <mach/common.h> int platform_cpu_kill(unsigned int cpu) { - return 1; + return shmobile_platform_cpu_kill(cpu); } void platform_cpu_die(unsigned int cpu) diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h index be78a2c73db4..8b8d80c2a510 100644 --- a/arch/arm/mach-shmobile/include/mach/common.h +++ b/arch/arm/mach-shmobile/include/mach/common.h @@ -4,6 +4,7 @@ extern struct sys_timer shmobile_timer; extern void shmobile_setup_console(void); extern void shmobile_secondary_vector(void); +extern int shmobile_platform_cpu_kill(unsigned int cpu); struct clk; extern int clk_init(void); extern void shmobile_handle_irq_intc(struct pt_regs *); diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c index c49a833bf9bb..3f3325d4206d 100644 --- a/arch/arm/mach-shmobile/platsmp.c +++ b/arch/arm/mach-shmobile/platsmp.c @@ -37,6 +37,11 @@ static void __init shmobile_smp_prepare_cpus(void) sh73a0_smp_prepare_cpus(); } +int shmobile_platform_cpu_kill(unsigned int cpu) +{ + return 1; +} + void __cpuinit platform_secondary_init(unsigned int cpu) { trace_hardirqs_off(); |