---

yaml --- r: 5047 b: refs/heads/master c: 62b3a04 h: refs/heads/master i: 5045: 252d0f3 5043: c344660 5039: fbb19b1 v: v3
git-mirror · Jul 26, 2005 · 2c692d2 · 2c692d2
1 parent a74691f
commit 2c692d2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c9a90073c75bffbb89763a0c7d44a2e44e9e628
+refs/heads/master: 62b3a04d75d2dc9480d5ad3b60f4258e548a6a83
diff --git a/trunk/arch/x86_64/kernel/reboot.c b/trunk/arch/x86_64/kernel/reboot.c
@@ -109,16 +109,10 @@ void machine_shutdown(void)
 	local_irq_enable();
 }
 
-void machine_restart(char * __unused)
+void machine_emergency_restart(void)
 {
 	int i;
 
-	printk("machine restart\n");
-
-	if (!reboot_force) {
-		machine_shutdown();
-	}
-
 	/* Tell the BIOS if we want cold or warm reboot */
 	*((unsigned short *)__va(0x472)) = reboot_mode;
 
@@ -143,6 +137,16 @@ void machine_restart(char * __unused)
 	}      
 }
 
+void machine_restart(char * __unused)
+{
+	printk("machine restart\n");
+
+	if (!reboot_force) {
+		machine_shutdown();
+	}
+	machine_emergency_restart();
+}
+
 void machine_halt(void)
 {
 }

diff --git a/trunk/include/asm-x86_64/emergency-restart.h b/trunk/include/asm-x86_64/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 */