diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2005-07-26 14:03:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 17:35:44 -0400 |
commit | 68acc05d0120e19c850e1f347ee96055f5aa032f (patch) | |
tree | 2eca1b36a99212037d1aa6b33c4893a12a43cb28 /drivers/char | |
parent | fdde86ac50357b6a811e3574e47d189e81a21444 (diff) |
[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>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/watchdog/pcwd.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
344 | *status |= WDIOF_OVERHEAT; | 344 | *status |= WDIOF_OVERHEAT; |
345 | if (temp_panic) { | 345 | if (temp_panic) { |
346 | printk (KERN_INFO PFX "Temperature overheat trip!\n"); | 346 | printk (KERN_INFO PFX "Temperature overheat trip!\n"); |
347 | machine_power_off(); | 347 | kernel_power_off(); |
348 | } | 348 | } |
349 | } | 349 | } |
350 | } else { | 350 | } else { |
@@ -355,7 +355,7 @@ static int pcwd_get_status(int *status) | |||
355 | *status |= WDIOF_OVERHEAT; | 355 | *status |= WDIOF_OVERHEAT; |
356 | if (temp_panic) { | 356 | if (temp_panic) { |
357 | printk (KERN_INFO PFX "Temperature overheat trip!\n"); | 357 | printk (KERN_INFO PFX "Temperature overheat trip!\n"); |
358 | machine_power_off(); | 358 | kernel_power_off(); |
359 | } | 359 | } |
360 | } | 360 | } |
361 | } | 361 | } |