* [PATCH] powerpc: Remove unnecessary CONFIG_SMP #ifdefs
@ 2016-05-02 6:00 Chris Smart
2016-05-04 22:40 ` Michael Ellerman
0 siblings, 1 reply; 2+ messages in thread
From: Chris Smart @ 2016-05-02 6:00 UTC (permalink / raw)
To: linuxppc-dev
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>
---
arch/powerpc/kernel/setup-common.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 44c8d03558ac..8ca79b7503d8 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -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) ;
--
2.5.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: powerpc: Remove unnecessary CONFIG_SMP #ifdefs
2016-05-02 6:00 [PATCH] powerpc: Remove unnecessary CONFIG_SMP #ifdefs Chris Smart
@ 2016-05-04 22:40 ` Michael Ellerman
0 siblings, 0 replies; 2+ messages in thread
From: Michael Ellerman @ 2016-05-04 22:40 UTC (permalink / raw)
To: Chris Smart, linuxppc-dev
On Mon, 2016-02-05 at 06:00:58 UTC, Chris Smart wrote:
> 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>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/44bd82e613778f5de3fad11ed7
cheers
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-05-04 22:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-02 6:00 [PATCH] powerpc: Remove unnecessary CONFIG_SMP #ifdefs Chris Smart
2016-05-04 22:40 ` Michael Ellerman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).