diff options
| author | James Bottomley | 2005-08-05 20:59:34 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-08-05 21:22:37 +0200 |
| commit | e6cb99413da42af413c11a394538ddc8b9d201e1 (patch) | |
| tree | 696dea49d74289726ac50fdbdebbbaae0f794340 /arch/i386/mach-voyager | |
| parent | [PATCH] tpm_infineon: Support for new TPM 1.2 and PNPACPI (diff) | |
| download | kernel-qcow2-linux-e6cb99413da42af413c11a394538ddc8b9d201e1.tar.gz kernel-qcow2-linux-e6cb99413da42af413c11a394538ddc8b9d201e1.tar.xz kernel-qcow2-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/i386/mach-voyager')
| -rw-r--r-- | arch/i386/mach-voyager/voyager_basic.c | 7 |
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); |