diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2005-08-06 13:45:10 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-06 12:54:57 -0700 |
| commit | 36cf446c2c4be6bae01517ea539dcebaf85c9fdf (patch) | |
| tree | fa988e457ce99f4eb9a85da9daf84951b5fcfe15 /arch | |
| parent | 094528a7fb3f75a83673e5cc3271fd466f2e278d (diff) | |
| download | op-kernel-dev-36cf446c2c4be6bae01517ea539dcebaf85c9fdf.zip op-kernel-dev-36cf446c2c4be6bae01517ea539dcebaf85c9fdf.tar.gz | |
[PATCH] i386 visws: Add machine_shutdown and emergency_restart
Another x86 subarchitecture bit I missed. This adds both
machine_emergency_restart missed in my reboot fixes and
machine_shutdown needed for kexec support.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/mach-visws/reboot.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/i386/mach-visws/reboot.c b/arch/i386/mach-visws/reboot.c index 9e92966..5d73e04 100644 --- a/arch/i386/mach-visws/reboot.c +++ b/arch/i386/mach-visws/reboot.c @@ -9,12 +9,15 @@ void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); -void machine_restart(char * __unused) +void machine_shutdown(void) { #ifdef CONFIG_SMP smp_send_stop(); #endif +} +void machine_emergency_restart(void) +{ /* * Visual Workstations restart after this * register is poked on the PIIX4 @@ -22,6 +25,12 @@ void machine_restart(char * __unused) outb(PIIX4_RESET_VAL, PIIX4_RESET_PORT); } +void machine_restart(char * __unused) +{ + machine_shutdown(); + machine_emergency_restart(); +} + void machine_power_off(void) { unsigned short pm_status; |
