diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2005-07-26 13:53:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 17:35:43 -0400 |
commit | f82567e55fcd25bb7addf2cfd8b79f36f409dc2e (patch) | |
tree | c579e6c540b10bfd69abc086f985fc066d2708fc /drivers/char/watchdog/softdog.c | |
parent | 4de8b9b76017365572f778332d74fe050d9c8c2a (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/softdog.c')
-rw-r--r-- | drivers/char/watchdog/softdog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/softdog.c b/drivers/char/watchdog/softdog.c index 117903498a01..0d93097f06b4 100644 --- a/drivers/char/watchdog/softdog.c +++ b/drivers/char/watchdog/softdog.c | |||
@@ -97,7 +97,7 @@ static void watchdog_fire(unsigned long data) | |||
97 | else | 97 | else |
98 | { | 98 | { |
99 | printk(KERN_CRIT PFX "Initiating system reboot.\n"); | 99 | printk(KERN_CRIT PFX "Initiating system reboot.\n"); |
100 | machine_restart(NULL); | 100 | emergency_restart(NULL); |
101 | printk(KERN_CRIT PFX "Reboot didn't ?????\n"); | 101 | printk(KERN_CRIT PFX "Reboot didn't ?????\n"); |
102 | } | 102 | } |
103 | } | 103 | } |