summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2005-08-06 21:42:45 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-06 21:54:57 +0200
commit094528a7fb3f75a83673e5cc3271fd466f2e278d (patch)
tree4d9fb39a134852f7dfdb2c49055f378a686ef072 /arch
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6 (diff)
downloadlinux-094528a7fb3f75a83673e5cc3271fd466f2e278d.tar.xz
linux-094528a7fb3f75a83673e5cc3271fd466f2e278d.zip
[PATCH] i386 voyager: Add machine_shutdown
Here is one more bit of breakage my x86 sub-architecture confusion caused. Add machine_shutdown to voyager so it will compile with CONFIG_KEXEC. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/mach-voyager/voyager_basic.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/i386/mach-voyager/voyager_basic.c b/arch/i386/mach-voyager/voyager_basic.c
index 62d0d9bf3fc0..c6384061328a 100644
--- a/arch/i386/mach-voyager/voyager_basic.c
+++ b/arch/i386/mach-voyager/voyager_basic.c
@@ -252,6 +252,12 @@ kb_wait(void)
}
void
+machine_shutdown(void)
+{
+ /* Architecture specific shutdown needed before a kexec */
+}
+
+void
machine_restart(char *cmd)
{
printk("Voyager Warm Restart\n");