From: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue, 26 Jul 2005 18:03:08 +0000 (-0600)
Subject: [PATCH] pcwd.c: Call kernel_power_off not machine_power_off
X-Git-Tag: v2.6.13-rc4~47
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=68acc05d0120e19c850e1f347ee96055f5aa032f;p=linux-2.6-omap-h63xx.git

[PATCH] pcwd.c: Call kernel_power_off not machine_power_off

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 <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/char/watchdog/pcwd.c b/drivers/char/watchdog/pcwd.c
index 592dca10886..6ebce3f2ef9 100644
--- 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();
 			}
 		}
 	}