Date: Mon, 28 Nov 2005 09:29:04 -0800 (PST)
From: Zwane Mwaikambo <zwane@arm.linux.org.uk>
To: "Eric W. Biederman" <ebiederm@xmission.com>
cc: Andi Kleen <ak@suse.de>, Linux Kernel <linux-kernel@vger.kernel.org>,
       Andrew Morton <akpm@osdl.org>, "Raj, Ashok" <ashok.raj@intel.com>,
       Stephen Hemminger <shemminger@osdl.org>
Subject: Re: [PATCH] i386/x86_64: Don't IPI to offline cpus on shutdown
In-Reply-To: <m1psolfqvt.fsf@ebiederm.dsl.xmission.com>
Message-ID: <Pine.LNX.4.61.0511280928060.1595@montezuma.fsmlabs.com>
References: <Pine.LNX.4.61.0511270115020.20046@montezuma.fsmlabs.com>
 <20051127135833.GH20775@brahms.suse.de> <m1wtiufa9z.fsf@ebiederm.dsl.xmission.com>
 <Pine.LNX.4.61.0511270836120.20046@montezuma.fsmlabs.com>
 <m1psolfqvt.fsf@ebiederm.dsl.xmission.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 996
Lines: 39

On Sun, 27 Nov 2005, Eric W. Biederman wrote:

> diff --git a/arch/x86_64/kernel/reboot.c b/arch/x86_64/kernel/reboot.c
> index 75235ed..57117b8 100644
> --- a/arch/x86_64/kernel/reboot.c
> +++ b/arch/x86_64/kernel/reboot.c
> @@ -6,6 +6,7 @@
>  #include <linux/kernel.h>
>  #include <linux/ctype.h>
>  #include <linux/string.h>
> +#include <linux/pm.h>
>  #include <asm/io.h>
>  #include <asm/kdebug.h>
>  #include <asm/delay.h>
> @@ -154,10 +155,11 @@ void machine_halt(void)
>  
>  void machine_power_off(void)
>  {
> -	if (!reboot_force) {
> -		machine_shutdown();
> -	}
> -	if (pm_power_off)
> +	if (pm_power_off) {
> +		if (!reboot_force) {
> +			machine_shutdown();
> +		}
>  		pm_power_off();
> +	}
>  }

That makes sense, thanks Eric.

	Zwane

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/