| From 1fa4f5b3348ba0018b47664cc621ca1e71c557c3 Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Thu, 8 Aug 2013 07:13:30 +0900 |
| Subject: ARM: shmobile: Introduce shmobile_smp_cpu_disable() |
| |
| Introduce the shared CPU Hotplug function shmobile_smp_cpu_disable() |
| for mach-shmobile. It is useful for the case when all CPUs may be |
| hotplugged, including CPU 0. |
| |
| Signed-off-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 5c4dfcd663b6e96cc20f02dc2c7c315749ea1bc1) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/include/mach/common.h | 1 + |
| arch/arm/mach-shmobile/platsmp.c | 7 +++++++ |
| 2 files changed, 8 insertions(+) |
| |
| diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h |
| index 7b938681e756..1ed155eb3e92 100644 |
| --- a/arch/arm/mach-shmobile/include/mach/common.h |
| +++ b/arch/arm/mach-shmobile/include/mach/common.h |
| @@ -13,6 +13,7 @@ extern void shmobile_smp_boot(void); |
| extern void shmobile_smp_sleep(void); |
| extern void shmobile_smp_hook(unsigned int cpu, unsigned long fn, |
| unsigned long arg); |
| +extern int shmobile_smp_cpu_disable(unsigned int cpu); |
| extern void shmobile_boot_scu(void); |
| extern void shmobile_smp_scu_prepare_cpus(unsigned int max_cpus); |
| extern int shmobile_smp_scu_boot_secondary(unsigned int cpu, |
| diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c |
| index d4ae616bcedb..3741562156ed 100644 |
| --- a/arch/arm/mach-shmobile/platsmp.c |
| +++ b/arch/arm/mach-shmobile/platsmp.c |
| @@ -44,3 +44,10 @@ void shmobile_smp_hook(unsigned int cpu, unsigned long fn, unsigned long arg) |
| shmobile_smp_arg[cpu] = arg; |
| flush_cache_all(); |
| } |
| + |
| +#ifdef CONFIG_HOTPLUG_CPU |
| +int shmobile_smp_cpu_disable(unsigned int cpu) |
| +{ |
| + return 0; /* Hotplug of any CPU is supported */ |
| +} |
| +#endif |
| -- |
| 1.8.5.rc3 |
| |
