]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] pcwd.c: Call kernel_power_off not machine_power_off
authorEric W. Biederman <ebiederm@xmission.com>
Tue, 26 Jul 2005 18:03:08 +0000 (12:03 -0600)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 26 Jul 2005 21:35:44 +0000 (14:35 -0700)
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>
drivers/char/watchdog/pcwd.c

index 592dca1088662cad7cabaaaf7ef984caa5877951..6ebce3f2ef9c5fca0ef0b4cfab03b83da818efeb 100644 (file)
@@ -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();
                        }
                }
        }