From: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue, 26 Jul 2005 17:45:31 +0000 (-0600)
Subject: [PATCH] x86_64: Implemenent machine_emergency_restart
X-Git-Tag: v2.6.13-rc4~55
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=62b3a04d75d2dc9480d5ad3b60f4258e548a6a83;p=linux-2.6-omap-h63xx.git

[PATCH] x86_64: Implemenent machine_emergency_restart

It is not safe to call set_cpus_allowed() in interrupt
context and disabling the apics is complicated code.
So unconditionally skip machine_shutdown in machine_emergency_reboot
on x86_64.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/x86_64/kernel/reboot.c b/arch/x86_64/kernel/reboot.c
index d4c45ff92d5..3d1cc09406a 100644
--- a/arch/x86_64/kernel/reboot.c
+++ b/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/include/asm-x86_64/emergency-restart.h b/include/asm-x86_64/emergency-restart.h
index 108d8c48e42..680c3956334 100644
--- a/include/asm-x86_64/emergency-restart.h
+++ b/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 */