diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2005-07-26 11:53:19 -0600 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 14:35:43 -0700 |
commit | f82567e55fcd25bb7addf2cfd8b79f36f409dc2e (patch) | |
tree | c579e6c540b10bfd69abc086f985fc066d2708fc /drivers/char/watchdog/softdog.c | |
parent | 4de8b9b76017365572f778332d74fe050d9c8c2a (diff) | |
download | kernel_samsung_smdk4412-f82567e55fcd25bb7addf2cfd8b79f36f409dc2e.zip kernel_samsung_smdk4412-f82567e55fcd25bb7addf2cfd8b79f36f409dc2e.tar.gz kernel_samsung_smdk4412-f82567e55fcd25bb7addf2cfd8b79f36f409dc2e.tar.bz2 |
[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 1179034..0d93097 100644 --- a/drivers/char/watchdog/softdog.c +++ b/drivers/char/watchdog/softdog.c @@ -97,7 +97,7 @@ static void watchdog_fire(unsigned long data) else { printk(KERN_CRIT PFX "Initiating system reboot.\n"); - machine_restart(NULL); + emergency_restart(NULL); printk(KERN_CRIT PFX "Reboot didn't ?????\n"); } } |