From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262008AbVGZSMV (ORCPT ); Tue, 26 Jul 2005 14:12:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262006AbVGZSJm (ORCPT ); Tue, 26 Jul 2005 14:09:42 -0400 Received: from ebiederm.dsl.xmission.com ([166.70.28.69]:53895 "EHLO ebiederm.dsl.xmission.com") by vger.kernel.org with ESMTP id S262008AbVGZSJd (ORCPT ); Tue, 26 Jul 2005 14:09:33 -0400 To: Andrew Morton Cc: Linus Torvalds , Subject: [PATCH 19/23] i386 machine_power_off cleanup References: From: ebiederm@xmission.com (Eric W. Biederman) Date: Tue, 26 Jul 2005 12:08:53 -0600 In-Reply-To: (Eric W. Biederman's message of "Tue, 26 Jul 2005 12:07:01 -0600") Message-ID: User-Agent: Gnus/5.1007 (Gnus v5.10.7) Emacs/21.4 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org 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 --- arch/i386/kernel/reboot.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) 9f163caa28f9d3392f0d8d3e5f131ea658a2a887 diff --git a/arch/i386/kernel/reboot.c b/arch/i386/kernel/reboot.c --- 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(); }