Commit e44c1b15 authored by Chris Smart's avatar Chris Smart Committed by Michael Ellerman

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.
Signed-off-by: default avatarChris Smart <chris@distroguy.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent c415c9cb
...@@ -128,9 +128,7 @@ void machine_restart(char *cmd) ...@@ -128,9 +128,7 @@ void machine_restart(char *cmd)
machine_shutdown(); machine_shutdown();
if (ppc_md.restart) if (ppc_md.restart)
ppc_md.restart(cmd); ppc_md.restart(cmd);
#ifdef CONFIG_SMP
smp_send_stop(); smp_send_stop();
#endif
printk(KERN_EMERG "System Halted, OK to turn off power\n"); printk(KERN_EMERG "System Halted, OK to turn off power\n");
local_irq_disable(); local_irq_disable();
while (1) ; while (1) ;
...@@ -141,9 +139,7 @@ void machine_power_off(void) ...@@ -141,9 +139,7 @@ void machine_power_off(void)
machine_shutdown(); machine_shutdown();
if (pm_power_off) if (pm_power_off)
pm_power_off(); pm_power_off();
#ifdef CONFIG_SMP
smp_send_stop(); smp_send_stop();
#endif
printk(KERN_EMERG "System Halted, OK to turn off power\n"); printk(KERN_EMERG "System Halted, OK to turn off power\n");
local_irq_disable(); local_irq_disable();
while (1) ; while (1) ;
...@@ -159,9 +155,7 @@ void machine_halt(void) ...@@ -159,9 +155,7 @@ void machine_halt(void)
machine_shutdown(); machine_shutdown();
if (ppc_md.halt) if (ppc_md.halt)
ppc_md.halt(); ppc_md.halt();
#ifdef CONFIG_SMP
smp_send_stop(); smp_send_stop();
#endif
printk(KERN_EMERG "System Halted, OK to turn off power\n"); printk(KERN_EMERG "System Halted, OK to turn off power\n");
local_irq_disable(); local_irq_disable();
while (1) ; while (1) ;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment