aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-04-18 13:04:09 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-04-18 13:04:09 -0400
commitda2265b130f6b5be3b874bb2832335887fe59461 (patch)
treea392a1578760b1b2a160241cc449c91fad5c3daf
parent41ef2d5678d83af030125550329b6ae8b74618fa (diff)
ARM: tegra: remove tegra specific cpu_disable()
The tegra cpu_disable() function is the same as the generic version in arch/arm/kernel/smp.c. Therefore, it can be removed. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-tegra/common.h1
-rw-r--r--arch/arm/mach-tegra/hotplug.c9
-rw-r--r--arch/arm/mach-tegra/platsmp.c1
3 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/mach-tegra/common.h b/arch/arm/mach-tegra/common.h
index 32f8eb3fe344..5900cc44f780 100644
--- a/arch/arm/mach-tegra/common.h
+++ b/arch/arm/mach-tegra/common.h
@@ -2,4 +2,3 @@ extern struct smp_operations tegra_smp_ops;
2 2
3extern int tegra_cpu_kill(unsigned int cpu); 3extern int tegra_cpu_kill(unsigned int cpu);
4extern void tegra_cpu_die(unsigned int cpu); 4extern void tegra_cpu_die(unsigned int cpu);
5extern int tegra_cpu_disable(unsigned int cpu);
diff --git a/arch/arm/mach-tegra/hotplug.c b/arch/arm/mach-tegra/hotplug.c
index a599f6e36dea..1fb9915f7895 100644
--- a/arch/arm/mach-tegra/hotplug.c
+++ b/arch/arm/mach-tegra/hotplug.c
@@ -47,15 +47,6 @@ void __ref tegra_cpu_die(unsigned int cpu)
47 BUG(); 47 BUG();
48} 48}
49 49
50int tegra_cpu_disable(unsigned int cpu)
51{
52 /*
53 * we don't allow CPU 0 to be shutdown (it is still too special
54 * e.g. clock tick interrupts)
55 */
56 return cpu == 0 ? -EPERM : 0;
57}
58
59#ifdef CONFIG_ARCH_TEGRA_2x_SOC 50#ifdef CONFIG_ARCH_TEGRA_2x_SOC
60extern void tegra20_hotplug_shutdown(void); 51extern void tegra20_hotplug_shutdown(void);
61void __init tegra20_hotplug_init(void) 52void __init tegra20_hotplug_init(void)
diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c
index 2c6b3d55213b..ec33ec86aad9 100644
--- a/arch/arm/mach-tegra/platsmp.c
+++ b/arch/arm/mach-tegra/platsmp.c
@@ -192,6 +192,5 @@ struct smp_operations tegra_smp_ops __initdata = {
192#ifdef CONFIG_HOTPLUG_CPU 192#ifdef CONFIG_HOTPLUG_CPU
193 .cpu_kill = tegra_cpu_kill, 193 .cpu_kill = tegra_cpu_kill,
194 .cpu_die = tegra_cpu_die, 194 .cpu_die = tegra_cpu_die,
195 .cpu_disable = tegra_cpu_disable,
196#endif 195#endif
197}; 196};