From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262012AbVGZSSu (ORCPT ); Tue, 26 Jul 2005 14:18:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262014AbVGZSRI (ORCPT ); Tue, 26 Jul 2005 14:17:08 -0400 Received: from ebiederm.dsl.xmission.com ([166.70.28.69]:59783 "EHLO ebiederm.dsl.xmission.com") by vger.kernel.org with ESMTP id S262035AbVGZSO4 (ORCPT ); Tue, 26 Jul 2005 14:14:56 -0400 To: Andrew Morton Cc: Linus Torvalds , Subject: [PATCH 21/23] x86_64 sync machine_power_off with i386 References: From: ebiederm@xmission.com (Eric W. Biederman) Date: Tue, 26 Jul 2005 12:14:16 -0600 In-Reply-To: (Eric W. Biederman's message of "Tue, 26 Jul 2005 12:10:02 -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 i386 machine_power_off was disabling the local apic and all of it's users wanted to be on the boot cpu. So call machine_shutdown which places us on the boot cpu and disables the apics. This keeps us in sync and reduces the number of cases we need to worry about in the power management code. Signed-off-by: Eric W. Biederman --- arch/x86_64/kernel/reboot.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) dbc7607f71b4c6e38b141340f7afd33248a4205a diff --git a/arch/x86_64/kernel/reboot.c b/arch/x86_64/kernel/reboot.c --- a/arch/x86_64/kernel/reboot.c +++ b/arch/x86_64/kernel/reboot.c @@ -153,6 +153,9 @@ void machine_halt(void) void machine_power_off(void) { + if (!reboot_force) { + machine_shutdown(); + } if (pm_power_off) pm_power_off(); }