aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/watchdog/wdt.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2005-07-26 13:53:19 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-26 17:35:43 -0400
commitf82567e55fcd25bb7addf2cfd8b79f36f409dc2e (patch)
treec579e6c540b10bfd69abc086f985fc066d2708fc /drivers/char/watchdog/wdt.c
parent4de8b9b76017365572f778332d74fe050d9c8c2a (diff)
[PATCH] Fix watchdog drivers to call emergency_reboot()
If a watchdog driver has decided it is time to reboot the system we know something is wrong and we are in interrupt context so emergency_reboot() is what we want. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/watchdog/wdt.c')
-rw-r--r--drivers/char/watchdog/wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/wdt.c b/drivers/char/watchdog/wdt.c
index 5684aa379886..1210ca0c425b 100644
--- a/drivers/char/watchdog/wdt.c
+++ b/drivers/char/watchdog/wdt.c
@@ -266,7 +266,7 @@ static irqreturn_t wdt_interrupt(int irq, void *dev_id, struct pt_regs *regs)
266 printk(KERN_CRIT "Would Reboot.\n"); 266 printk(KERN_CRIT "Would Reboot.\n");
267#else 267#else
268 printk(KERN_CRIT "Initiating system reboot.\n"); 268 printk(KERN_CRIT "Initiating system reboot.\n");
269 machine_restart(NULL); 269 emergency_restart();
270#endif 270#endif
271#else 271#else
272 printk(KERN_CRIT "Reset in 5ms.\n"); 272 printk(KERN_CRIT "Reset in 5ms.\n");