[PATCH] powerpc: Allow for ppc_md restart, power_off, and halt to be NULL

Kumar Gala galak at gate.crashing.org
Sat Jan 14 03:15:17 EST 2006


On a number of embedded reference boards there isn't always a
way to reset, power_off, or halt the board.  Rather than having
each board implement a spin loop just let the generic code do
it.

Signed-off-by: Kumar Gala <galak at kernel.crashing.org>

---
commit be64cad3bdcae667f790fcf6f3e066be498baa83
tree 1437c325cfda412ded472c3dee505f81468f41b0
parent 66c0ddd1284ef56bfeb41374b51edfd0c8a980a8
author Kumar Gala <galak at kernel.crashing.org> Fri, 13 Jan 2006 09:46:28 -0600
committer Kumar Gala <galak at kernel.crashing.org> Fri, 13 Jan 2006 09:46:28 -0600

 arch/powerpc/kernel/setup-common.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index d5c52fa..be12041 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -100,7 +100,8 @@ void machine_shutdown(void)
 void machine_restart(char *cmd)
 {
 	machine_shutdown();
-	ppc_md.restart(cmd);
+	if (ppc_md.restart)
+		ppc_md.restart(cmd);
 #ifdef CONFIG_SMP
 	smp_send_stop();
 #endif
@@ -112,7 +113,8 @@ void machine_restart(char *cmd)
 void machine_power_off(void)
 {
 	machine_shutdown();
-	ppc_md.power_off();
+	if (ppc_md.power_off)
+		ppc_md.power_off();
 #ifdef CONFIG_SMP
 	smp_send_stop();
 #endif
@@ -129,7 +131,8 @@ EXPORT_SYMBOL_GPL(pm_power_off);
 void machine_halt(void)
 {
 	machine_shutdown();
-	ppc_md.halt();
+	if (ppc_md.halt)
+		ppc_md.halt();
 #ifdef CONFIG_SMP
 	smp_send_stop();
 #endif




More information about the Linuxppc64-dev mailing list