Xen devel - Aug 2006 - [PATCH][LINUX] use machine_emergency_restart() from the

--text follows this line--

This patch uses the standard generic header for the definition of
machine_emergency_restart() and reverses the call path for XenoLinux.

Signed-off-by: Jimi Xenidis <jimix@watson.ibm.com>

---

diff -r 7680b29c03a6 drivers/xen/core/reboot.c
--- a/drivers/xen/core/reboot.c	Sat Aug 05 11:33:24 2006 -0400
+++ b/drivers/xen/core/reboot.c	Mon Aug 07 09:50:33 2006 -0400
@@ -9,6 +9,7 @@
 #include <linux/stringify.h>
 #include <asm/irq.h>
 #include <asm/mmu_context.h>
+#include <asm/emergency-restart.h>
 #include <xen/evtchn.h>
 #include <asm/hypervisor.h>
 #include <xen/interface/dom0_ops.h>
@@ -39,16 +40,11 @@ extern void ctrl_alt_del(void);
  */
 #define SHUTDOWN_HALT      4
 
-void machine_emergency_restart(void)
+void machine_restart(char * __unused)
 {
 	/* We really want to get pending console data out before we die. */
 	xencons_force_flush();
 	HYPERVISOR_shutdown(SHUTDOWN_reboot);
-}
-
-void machine_restart(char * __unused)
-{
-	machine_emergency_restart();
 }
 
 void machine_halt(void)

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel