diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2005-07-26 12:08:53 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 14:35:44 -0700 |
| commit | 4fa2564a6fde9815df969ef3547744a22f66ba9d (patch) | |
| tree | 46b300dadf7749e41158a909631c4715ef4f0111 /arch | |
| parent | d8e392e7c8f019657ff3ebe70a45d234990831db (diff) | |
| download | blackbird-op-linux-4fa2564a6fde9815df969ef3547744a22f66ba9d.tar.gz blackbird-op-linux-4fa2564a6fde9815df969ef3547744a22f66ba9d.zip | |
[PATCH] i386 machine_power_off cleanup
Call machine_shutdown() to move to the boot cpu
and disable apics. Both acpi_power_off and
apm_power_off want to move to the boot cpu.
and we are already disabling the local apics
so calling machine_shutdown simply reuses
code.
ia64 doesn't have a special path in power_off
for efi so there is no reason i386 should. If
we really need to call the efi power off path
the efi driver can set pm_power_off like everyone
else.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/kernel/reboot.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/i386/kernel/reboot.c b/arch/i386/kernel/reboot.c index 1049876702aa..c71fef31dc47 100644 --- a/arch/i386/kernel/reboot.c +++ b/arch/i386/kernel/reboot.c @@ -347,10 +347,8 @@ void machine_halt(void) void machine_power_off(void) { - lapic_shutdown(); + machine_shutdown(); - if (efi_enabled) - efi.reset_system(EFI_RESET_SHUTDOWN, EFI_SUCCESS, 0, NULL); if (pm_power_off) pm_power_off(); } |
