From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261996AbVGZSET (ORCPT ); Tue, 26 Jul 2005 14:04:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261992AbVGZSEI (ORCPT ); Tue, 26 Jul 2005 14:04:08 -0400 Received: from ebiederm.dsl.xmission.com ([166.70.28.69]:48775 "EHLO ebiederm.dsl.xmission.com") by vger.kernel.org with ESMTP id S261998AbVGZSDu (ORCPT ); Tue, 26 Jul 2005 14:03:50 -0400 To: Andrew Morton Cc: Linus Torvalds , Subject: [PATCH 17/23] pcwd.c: Call kernel_power_off not machine_power_off References: From: ebiederm@xmission.com (Eric W. Biederman) Date: Tue, 26 Jul 2005 12:03:08 -0600 In-Reply-To: (Eric W. Biederman's message of "Tue, 26 Jul 2005 12:01:17 -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 The call appears to come from process context so kernel_power_off should be safe. And acpi_power_off won't necessarily work if you just call machine_power_off. Signed-off-by: Eric W. Biederman --- drivers/char/watchdog/pcwd.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) b663accd4b051598a8c877aeb2e4ee7da94e3af3 diff --git a/drivers/char/watchdog/pcwd.c b/drivers/char/watchdog/pcwd.c --- a/drivers/char/watchdog/pcwd.c +++ b/drivers/char/watchdog/pcwd.c @@ -344,7 +344,7 @@ static int pcwd_get_status(int *status) *status |= WDIOF_OVERHEAT; if (temp_panic) { printk (KERN_INFO PFX "Temperature overheat trip!\n"); - machine_power_off(); + kernel_power_off(); } } } else { @@ -355,7 +355,7 @@ static int pcwd_get_status(int *status) *status |= WDIOF_OVERHEAT; if (temp_panic) { printk (KERN_INFO PFX "Temperature overheat trip!\n"); - machine_power_off(); + kernel_power_off(); } } }