From 252d0f306c8ebff5c348d0f0616b7cb9078feaab Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Tue, 26 Jul 2005 11:41:26 -0600
Subject: [PATCH] --- yaml --- r: 5045 b: refs/heads/master c:
 4a1421f81b64e49ce932125e7222a2d7b7f87f13 h: refs/heads/master i:   5043:
 c344660781be13260eecdd9d040e44df2fb61a8e v: v3

---
 [refs]                                     |  2 +-
 trunk/arch/i386/kernel/reboot.c            | 10 +++++++---
 trunk/include/asm-i386/emergency-restart.h |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1ef0fc4ca84b..c03c24468df7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59586e5a262a29361c45c929ea3253d4aec830b0
+refs/heads/master: 4a1421f81b64e49ce932125e7222a2d7b7f87f13
diff --git a/trunk/arch/i386/kernel/reboot.c b/trunk/arch/i386/kernel/reboot.c
index 1b24bc7271af..d473350aa055 100644
--- a/trunk/arch/i386/kernel/reboot.c
+++ b/trunk/arch/i386/kernel/reboot.c
@@ -311,10 +311,8 @@ void machine_shutdown(void)
 #endif
 }
 
-void machine_restart(char * __unused)
+void machine_emergency_restart(void)
 {
-	machine_shutdown();
-
 	if (!reboot_thru_bios) {
 		if (efi_enabled) {
 			efi.reset_system(EFI_RESET_COLD, EFI_SUCCESS, 0, NULL);
@@ -337,6 +335,12 @@ void machine_restart(char * __unused)
 	machine_real_restart(jump_to_bios, sizeof(jump_to_bios));
 }
 
+void machine_restart(char * __unused)
+{
+	machine_shutdown();
+	machine_emergency_restart();
+}
+
 void machine_halt(void)
 {
 }
diff --git a/trunk/include/asm-i386/emergency-restart.h b/trunk/include/asm-i386/emergency-restart.h
index 108d8c48e42e..680c39563345 100644
--- a/trunk/include/asm-i386/emergency-restart.h
+++ b/trunk/include/asm-i386/emergency-restart.h
@@ -1,6 +1,6 @@
 #ifndef _ASM_EMERGENCY_RESTART_H
 #define _ASM_EMERGENCY_RESTART_H
 
-#include <asm-generic/emergency-restart.h>
+extern void machine_emergency_restart(void);
 
 #endif /* _ASM_EMERGENCY_RESTART_H */