[PATCH] i386 machine_power_off cleanup
authorEric W. Biederman <ebiederm@xmission.com>
Tue, 26 Jul 2005 18:08:53 +0000 (12:08 -0600)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 26 Jul 2005 21:35:44 +0000 (14:35 -0700)
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>
arch/i386/kernel/reboot.c

index 1049876702aa33c0d63de40b12a0dc3ce048ac95..c71fef31dc4797d891f10c5d8d257bbf11d73df7 100644 (file)
@@ -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();
 }