diff options
| -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 e0d763be1846..3d05190797cb 100644 --- a/arch/arm/include/asm/smp.h +++ b/arch/arm/include/asm/smp.h | |||
| @@ -82,7 +82,7 @@ struct secondary_data { | |||
| 82 | extern struct secondary_data secondary_data; | 82 | extern struct secondary_data secondary_data; |
| 83 | 83 | ||
| 84 | extern int __cpu_disable(void); | 84 | extern int __cpu_disable(void); |
| 85 | extern int mach_cpu_disable(unsigned int cpu); | 85 | extern int platform_cpu_disable(unsigned int cpu); |
| 86 | 86 | ||
| 87 | extern void __cpu_die(unsigned int cpu); | 87 | extern void __cpu_die(unsigned int cpu); |
| 88 | extern void cpu_die(void); | 88 | extern void cpu_die(void); |
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 577543f3857f..7a3cc0266934 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c | |||
| @@ -162,7 +162,7 @@ int __cpu_disable(void) | |||
| 162 | struct task_struct *p; | 162 | struct task_struct *p; |
| 163 | int ret; | 163 | int ret; |
| 164 | 164 | ||
| 165 | ret = mach_cpu_disable(cpu); | 165 | ret = platform_cpu_disable(cpu); |
| 166 | if (ret) | 166 | if (ret) |
| 167 | return ret; | 167 | return ret; |
| 168 | 168 | ||
diff --git a/arch/arm/mach-realview/hotplug.c b/arch/arm/mach-realview/hotplug.c index be048e3e8799..f95521a5e5ce 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) | |||
| 131 | cpu_leave_lowpower(); | 131 | cpu_leave_lowpower(); |
| 132 | } | 132 | } |
| 133 | 133 | ||
| 134 | int mach_cpu_disable(unsigned int cpu) | 134 | int platform_cpu_disable(unsigned int cpu) |
| 135 | { | 135 | { |
| 136 | /* | 136 | /* |
| 137 | * we don't allow CPU 0 to be shutdown (it is still too special | 137 | * we don't allow CPU 0 to be shutdown (it is still too special |
