Skip to contentSkip to conversation

powerpc: Remove unnecessary CONFIG_SMP #ifdefs

PATCH Applied Chris Smart 2 participants 2 messages May 2, 2016 – May 4, 2016 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc: Remove unnecessary CONFIG_SMP #ifdefs

The code in machine_restart/power_off/halt() includes #ifdefs around calls to smp_send_stop(), however these are not required as include/linux/smp.h includes an empty version of this function for CONFIG_SMP=n builds.

---
arch/powerpc/kernel/setup-common.c | 6 ------

1 file changed, 6 deletions(-)
arch/powerpc/kernel/setup-common.c +0 -0
index 44c8d03558ac..8ca79b7503d8 100644
@@ -128,9 +128,7 @@ void machine_restart(char *cmd)
	machine_shutdown();
	if (ppc_md.restart)
		ppc_md.restart(cmd);
-#ifdef CONFIG_SMP
	smp_send_stop();
-#endif
	printk(KERN_EMERG "System Halted, OK to turn off power\n");
	local_irq_disable();
	while (1) ;
@@ -141,9 +139,7 @@ void machine_power_off(void)
	machine_shutdown();
	if (pm_power_off)
		pm_power_off();
-#ifdef CONFIG_SMP
	smp_send_stop();
-#endif
	printk(KERN_EMERG "System Halted, OK to turn off power\n");
	local_irq_disable();
	while (1) ;
@@ -159,9 +155,7 @@ void machine_halt(void)
	machine_shutdown();
	if (ppc_md.halt)
		ppc_md.halt();
-#ifdef CONFIG_SMP
	smp_send_stop();
-#endif
	printk(KERN_EMERG "System Halted, OK to turn off power\n");
	local_irq_disable();
	while (1) ;
Signature · 1 line
2.5.5