Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1450362

[PATCH 1/3] powerpc: Factor out common code in setup-common.c

Show all headers | View raw

Factor out a small bit of common code in machine_restart(),
machine_power_off() and machine_halt().

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 arch/powerpc/kernel/setup-common.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 714b4ba..5cd3283 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -130,15 +130,22 @@ void machine_shutdown(void)
 		ppc_md.machine_shutdown();
 }
 
+static void machine_hang(void)
+{
+	pr_emerg("System Halted, OK to turn off power\n");
+	local_irq_disable();
+	while (1)
+		;
+}
+
 void machine_restart(char *cmd)
 {
 	machine_shutdown();
 	if (ppc_md.restart)
 		ppc_md.restart(cmd);
+
 	smp_send_stop();
-	printk(KERN_EMERG "System Halted, OK to turn off power\n");
-	local_irq_disable();
-	while (1) ;
+	machine_hang();
 }
 
 void machine_power_off(void)
@@ -146,10 +153,9 @@ void machine_power_off(void)
 	machine_shutdown();
 	if (pm_power_off)
 		pm_power_off();
+
 	smp_send_stop();
-	printk(KERN_EMERG "System Halted, OK to turn off power\n");
-	local_irq_disable();
-	while (1) ;
+	machine_hang();
 }
 /* Used by the G5 thermal driver */
 EXPORT_SYMBOL_GPL(machine_power_off);
@@ -162,10 +168,9 @@ void machine_halt(void)
 	machine_shutdown();
 	if (ppc_md.halt)
 		ppc_md.halt();
+
 	smp_send_stop();
-	printk(KERN_EMERG "System Halted, OK to turn off power\n");
-	local_irq_disable();
-	while (1) ;
+	machine_hang();
 }
 
 
-- 
2.5.5

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/3] powerpc: Factor out common code in setup-common.c Andrey Smirnov <andrew.smirnov@gmail.com> - 2016-07-26 06:30 +0200
  [PATCH 3/3] powerpc: Convert fsl_rstcr_restart to a reset handler Andrey Smirnov <andrew.smirnov@gmail.com> - 2016-07-26 06:30 +0200
    Re: [PATCH 3/3] powerpc: Convert fsl_rstcr_restart to a reset  handler Scott Wood <oss@buserror.net> - 2016-07-26 10:00 +0200
      Re: [PATCH 3/3] powerpc: Convert fsl_rstcr_restart to a reset  handler Scott Wood <oss@buserror.net> - 2016-07-26 23:30 +0200
      Re: [PATCH 3/3] powerpc: Convert fsl_rstcr_restart to a reset handler Andrey Smirnov <andrew.smirnov@gmail.com> - 2016-07-26 23:30 +0200

csiph-web