Skip to content

Commit

Permalink
ARM: mach-shmobile: Allow SoC specific CPU kill code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Magnus Damm authored and Paul Mundt committed Jan 9, 2012
1 parent f0eab38 commit 8b30679
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/arm/mach-shmobile/hotplug.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-shmobile/include/mach/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 *);
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/mach-shmobile/platsmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 8b30679

Please sign in to comment.