diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2005-07-26 12:03:08 -0600 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 14:35:44 -0700 |
| commit | 68acc05d0120e19c850e1f347ee96055f5aa032f (patch) | |
| tree | 2eca1b36a99212037d1aa6b33c4893a12a43cb28 /drivers | |
| parent | [PATCH] swpsuspend: Have suspend to disk use factors of sys_reboot (diff) | |
| download | linux-dev-68acc05d0120e19c850e1f347ee96055f5aa032f.tar.xz linux-dev-68acc05d0120e19c850e1f347ee96055f5aa032f.zip | |
[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')
| -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 592dca108866..6ebce3f2ef9c 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(); } } } |