powerpc: Remove unnecessary CONFIG_SMP #ifdefs
authorChris Smart <chris@distroguy.com>
Mon, 2 May 2016 06:00:58 +0000 (16:00 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 11 May 2016 11:54:01 +0000 (21:54 +1000)
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: Chris Smart <chris@distroguy.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/setup-common.c

index 44c8d03..8ca79b7 100644 (file)
@@ -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) ;