diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-15 10:18:05 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-15 15:03:51 +0100 |
| commit | 8e2a43f5f5e1255879064924917fb1a6e5be7cb3 (patch) | |
| tree | 561ddfdf7bc8e152f0f13bc4dcfe18f3eb517fd5 | |
| parent | 75070612c49c0bb976bb9221d051b20316ad1bc7 (diff) | |
| download | linux-3.10-8e2a43f5f5e1255879064924917fb1a6e5be7cb3.tar.gz linux-3.10-8e2a43f5f5e1255879064924917fb1a6e5be7cb3.tar.bz2 linux-3.10-8e2a43f5f5e1255879064924917fb1a6e5be7cb3.zip | |
ARM: rename mach_cpu_disable() to platform_cpu_disable()
Consistently name all SMP platform related functions.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/include/asm/smp.h | 2 | ||||
| -rw-r--r-- | arch/arm/kernel/smp.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-realview/hotplug.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h index e0d763be184..3d05190797c 100644 --- a/arch/arm/include/asm/smp.h +++ b/arch/arm/include/asm/smp.h @@ -82,7 +82,7 @@ struct secondary_data { extern struct secondary_data secondary_data; extern int __cpu_disable(void); -extern int mach_cpu_disable(unsigned int cpu); +extern int platform_cpu_disable(unsigned int cpu); extern void __cpu_die(unsigned int cpu); extern void cpu_die(void); diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 577543f3857..7a3cc026693 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -162,7 +162,7 @@ int __cpu_disable(void) struct task_struct *p; int ret; - ret = mach_cpu_disable(cpu); + ret = platform_cpu_disable(cpu); if (ret) return ret; diff --git a/arch/arm/mach-realview/hotplug.c b/arch/arm/mach-realview/hotplug.c index be048e3e879..f95521a5e5c 100644 --- a/arch/arm/mach-realview/hotplug.c +++ b/arch/arm/mach-realview/hotplug.c @@ -131,7 +131,7 @@ void platform_cpu_die(unsigned int cpu) cpu_leave_lowpower(); } -int mach_cpu_disable(unsigned int cpu) +int platform_cpu_disable(unsigned int cpu) { /* * we don't allow CPU 0 to be shutdown (it is still too special |