]> err.no Git - linux-2.6/commitdiff
[POWERPC] Make function of pm_power_off consistent with x86
authorCorey Minyard <minyard@acm.org>
Wed, 6 Sep 2006 14:02:53 +0000 (09:02 -0500)
committerPaul Mackerras <paulus@samba.org>
Wed, 13 Sep 2006 08:39:52 +0000 (18:39 +1000)
Allow the pm_power_off function variable in PPC to work as an override.
This makes the function consistent with the other architectures and it
allows generic poweroff operations (like those provided in IPMI
systems) to work properly on PPC.

Signed-off-by: Corey Minyard <minyard@acm.org>
Cc: Joseph Barnett <jbarnett@motorola.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/ppc/kernel/setup.c

index a74f46d9826fc4c6a670897b55e03c1524a15f3f..5458ac5da7c3f9f535f01c3c2b42934beee13acc 100644 (file)
@@ -127,11 +127,8 @@ void machine_restart(char *cmd)
        ppc_md.restart(cmd);
 }
 
-void machine_power_off(void)
+static void ppc_generic_power_off(void)
 {
-#ifdef CONFIG_NVRAM
-       nvram_sync();
-#endif
        ppc_md.power_off();
 }
 
@@ -143,7 +140,17 @@ void machine_halt(void)
        ppc_md.halt();
 }
 
-void (*pm_power_off)(void) = machine_power_off;
+void (*pm_power_off)(void) = ppc_generic_power_off;
+
+void machine_power_off(void)
+{
+#ifdef CONFIG_NVRAM
+       nvram_sync();
+#endif
+       if (pm_power_off)
+               pm_power_off();
+       ppc_generic_power_off();
+}
 
 #ifdef CONFIG_TAU
 extern u32 cpu_temp(unsigned long cpu);