summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@SteelEye.com>2005-08-05 11:59:34 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-05 12:22:37 -0700
commite6cb99413da42af413c11a394538ddc8b9d201e1 (patch)
tree696dea49d74289726ac50fdbdebbbaae0f794340 /arch
parentf9abb020405c94edb0717315f1510086b1574a22 (diff)
downloadblackbird-op-linux-e6cb99413da42af413c11a394538ddc8b9d201e1.tar.gz
blackbird-op-linux-e6cb99413da42af413c11a394538ddc8b9d201e1.zip
[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>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/mach-voyager/voyager_basic.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/i386/mach-voyager/voyager_basic.c b/arch/i386/mach-voyager/voyager_basic.c
index b3eda46e0fe9..62d0d9bf3fc0 100644
--- a/arch/i386/mach-voyager/voyager_basic.c
+++ b/arch/i386/mach-voyager/voyager_basic.c
@@ -279,6 +279,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)
{
__u8 dumpval __attribute__((unused)) = inb(0xf823);
OpenPOWER on IntegriCloud