diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-27 09:14:13 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-27 09:14:13 -0400 |
| commit | c5fbc3966f48279dbebfde10248c977014aa9988 (patch) | |
| tree | 0a52f645d89f91952c26b215f460a4ba195ca42c /drivers/char/watchdog/wdt.c | |
| parent | 39299d9d15c41cbdd7c7009967cd35afaf34d8fa (diff) | |
| parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/char/watchdog/wdt.c')
| -rw-r--r-- | drivers/char/watchdog/wdt.c | 2 |
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"); |