]> err.no Git - linux-2.6/commitdiff
[PATCH] i386 visws: Add machine_shutdown and emergency_restart
authorEric W. Biederman <ebiederm@xmission.com>
Sat, 6 Aug 2005 19:45:10 +0000 (13:45 -0600)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 6 Aug 2005 19:54:57 +0000 (12:54 -0700)
Another x86 subarchitecture bit I missed.  This adds both
machine_emergency_restart missed in my reboot fixes and
machine_shutdown needed for kexec support.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/i386/mach-visws/reboot.c

index 9e9296676f931dfc2831f40c127933d2f772badf..5d73e042ed0a15470654a28ad1549cb4a9cbedff 100644 (file)
@@ -9,12 +9,15 @@
 void (*pm_power_off)(void);
 EXPORT_SYMBOL(pm_power_off);
 
-void machine_restart(char * __unused)
+void machine_shutdown(void)
 {
 #ifdef CONFIG_SMP
        smp_send_stop();
 #endif
+}
 
+void machine_emergency_restart(void)
+{
        /*
         * Visual Workstations restart after this
         * register is poked on the PIIX4
@@ -22,6 +25,12 @@ void machine_restart(char * __unused)
        outb(PIIX4_RESET_VAL, PIIX4_RESET_PORT);
 }
 
+void machine_restart(char * __unused)
+{
+       machine_shutdown();
+       machine_emergency_restart();
+}
+
 void machine_power_off(void)
 {
        unsigned short pm_status;