Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da2265b1 authored by Russell King's avatar Russell King
Browse files

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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 41ef2d56

arch/arm/mach-tegra/common.h

+0 −1
Original line number Diff line number Diff line
@@ -2,4 +2,3 @@ extern struct smp_operations tegra_smp_ops; 


extern int tegra_cpu_kill(unsigned int cpu);

extern void tegra_cpu_die(unsigned int cpu);
 
extern int tegra_cpu_disable(unsigned int cpu);

arch/arm/mach-tegra/hotplug.c

+0 −9
Original line number Diff line number Diff line
@@ -47,15 +47,6 @@ void __ref tegra_cpu_die(unsigned int cpu) 
	BUG();

}



int tegra_cpu_disable(unsigned int cpu)

{

	/*

	 * we don't allow CPU 0 to be shutdown (it is still too special

	 * e.g. clock tick interrupts)

	 */

	return cpu == 0 ? -EPERM : 0;

}



#ifdef CONFIG_ARCH_TEGRA_2x_SOC

extern void tegra20_hotplug_shutdown(void);

void __init tegra20_hotplug_init(void)

arch/arm/mach-tegra/platsmp.c

+0 −1
Original line number Diff line number Diff line
@@ -192,6 +192,5 @@ struct smp_operations tegra_smp_ops __initdata = { 
#ifdef CONFIG_HOTPLUG_CPU

	.cpu_kill		= tegra_cpu_kill,

	.cpu_die		= tegra_cpu_die,

	.cpu_disable		= tegra_cpu_disable,

#endif

};