From fb7017acd5421583dca5f8313f70c77198dfda98 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Sat, 6 Aug 2005 13:45:10 -0600
Subject: [PATCH] --- yaml --- r: 5689 b: refs/heads/master c:
 36cf446c2c4be6bae01517ea539dcebaf85c9fdf h: refs/heads/master i:   5687:
 eef9c8063f9906345d653881f23d1ec98dfd1f5b v: v3

---
 [refs]                              |  2 +-
 trunk/arch/i386/mach-visws/reboot.c | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 967b6cea8338..b8fc7fef2f31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 094528a7fb3f75a83673e5cc3271fd466f2e278d
+refs/heads/master: 36cf446c2c4be6bae01517ea539dcebaf85c9fdf
diff --git a/trunk/arch/i386/mach-visws/reboot.c b/trunk/arch/i386/mach-visws/reboot.c
index 9e9296676f93..5d73e042ed0a 100644
--- a/trunk/arch/i386/mach-visws/reboot.c
+++ b/trunk/arch/i386/mach-visws/reboot.c
@@ -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;