From: James Bottomley <James.Bottomley@SteelEye.com>
Date: Fri, 5 Aug 2005 18:59:34 +0000 (-0700)
Subject: [PATCH] fix voyager compile after machine_emergency_restart breakage
X-Git-Tag: v2.6.13-rc6~30
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e6cb99413da42af413c11a394538ddc8b9d201e1;p=linux-2.6-omap-h63xx.git

[PATCH] fix voyager compile after machine_emergency_restart breakage

[PATCH] i386: Implement machine_emergency_reboot

introduced this new function into arch/i386/reboot.c.  However,
subarchitectures are entitled to implement their own copies of reboot.c
from which this new function is now missing.

It looks like visws will also need a similar fixup

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/i386/mach-voyager/voyager_basic.c b/arch/i386/mach-voyager/voyager_basic.c
index b3eda46e0fe..62d0d9bf3fc 100644
--- a/arch/i386/mach-voyager/voyager_basic.c
+++ b/arch/i386/mach-voyager/voyager_basic.c
@@ -278,6 +278,13 @@ machine_restart(char *cmd)
 	}
 }
 
+void
+machine_emergency_restart(void)
+{
+	/*for now, just hook this to a warm restart */
+	machine_restart(NULL);
+}
+
 void
 mca_nmi_hook(void)
 {