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

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

ARM: CPU hotplug: remove bug checks in platform_cpu_die() 



platform_cpu_die() is entered from the CPU's own idle thread, which
can not be migrated to other CPUs.  Moreover, the 'cpu' argument
comes from the thread info, which will always be the 'current'
CPU.  So remove this useless bug check.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 3c030bea

arch/arm/mach-omap2/omap-hotplug.c

+0 −8
Original line number Diff line number Diff line
@@ -32,14 +32,6 @@ int platform_cpu_kill(unsigned int cpu) 
 */

void platform_cpu_die(unsigned int cpu)

{

	unsigned int this_cpu = hard_smp_processor_id();



	if (cpu != this_cpu) {

		pr_crit("platform_cpu_die running on %u, should be %u\n",

			   this_cpu, cpu);

		BUG();

	}



	flush_cache_all();

	dsb();

arch/arm/mach-realview/hotplug.c

+0 −10
Original line number Diff line number Diff line
@@ -102,16 +102,6 @@ int platform_cpu_kill(unsigned int cpu) 
 */

void platform_cpu_die(unsigned int cpu)

{

#ifdef DEBUG

	unsigned int this_cpu = hard_smp_processor_id();



	if (cpu != this_cpu) {

		printk(KERN_CRIT "Eek! platform_cpu_die running on %u, should be %u\n",

			   this_cpu, cpu);

		BUG();

	}

#endif



	/*

	 * we're ready for shutdown now, so do it

	 */

arch/arm/mach-s5pv310/hotplug.c

+0 −10
Original line number Diff line number Diff line
@@ -105,16 +105,6 @@ int platform_cpu_kill(unsigned int cpu) 
 */

void platform_cpu_die(unsigned int cpu)

{

#ifdef DEBUG

	unsigned int this_cpu = hard_smp_processor_id();



	if (cpu != this_cpu) {

		printk(KERN_CRIT "Eek! platform_cpu_die running on %u, should be %u\n",

			   this_cpu, cpu);

		BUG();

	}

#endif



	/*

	 * we're ready for shutdown now, so do it

	 */

arch/arm/mach-tegra/hotplug.c

+0 −10
Original line number Diff line number Diff line
@@ -101,16 +101,6 @@ int platform_cpu_kill(unsigned int cpu) 
 */

void platform_cpu_die(unsigned int cpu)

{

#ifdef DEBUG

	unsigned int this_cpu = hard_smp_processor_id();



	if (cpu != this_cpu) {

		printk(KERN_CRIT "Eek! platform_cpu_die running on %u, should be %u\n",

			   this_cpu, cpu);

		BUG();

	}

#endif



	/*

	 * we're ready for shutdown now, so do it

	 */

arch/arm/mach-ux500/hotplug.c

+0 −10
Original line number Diff line number Diff line
@@ -45,16 +45,6 @@ int platform_cpu_kill(unsigned int cpu) 
 */

void platform_cpu_die(unsigned int cpu)

{

#ifdef DEBUG

	unsigned int this_cpu = hard_smp_processor_id();



	if (cpu != this_cpu) {

		printk(KERN_CRIT "Eek! platform_cpu_die running on %u, should be %u\n",

			   this_cpu, cpu);

		BUG();

	}

#endif



	/* directly enter low power state, skipping secure registers */

	platform_do_lowpower(cpu);

}