kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] Fix watchdog drivers to call emergency_reboot()

Browse source 
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>
This commit is contained in:
Eric W. Biederman 2005-07-26 11:53:19 -06:00 committed by Linus Torvalds
parent 4de8b9b760
commit f82567e55f
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/char/watchdog/eurotechwdt.c
View file

@ -167,7 +167,7 @@ static irqreturn_t eurwdt_interrupt(int irq, void *dev_id, struct pt_regs *regs)
printk(KERN_CRIT "Would Reboot.\n"); printk(KERN_CRIT "Would Reboot.\n");
#else #else
printk(KERN_CRIT "Initiating system reboot.\n"); printk(KERN_CRIT "Initiating system reboot.\n");
machine_restart(NULL); emergency_restart(NULL);
#endif #endif
return IRQ_HANDLED; return IRQ_HANDLED;
} }

2
drivers/char/watchdog/softdog.c
View file

@ -97,7 +97,7 @@ static void watchdog_fire(unsigned long data)
else else
{ {
printk(KERN_CRIT PFX "Initiating system reboot.\n"); printk(KERN_CRIT PFX "Initiating system reboot.\n");
machine_restart(NULL); emergency_restart(NULL);
printk(KERN_CRIT PFX "Reboot didn't ?????\n"); printk(KERN_CRIT PFX "Reboot didn't ?????\n");
} }
} }

2
drivers/char/watchdog/wdt.c
View file

@ -266,7 +266,7 @@ static irqreturn_t wdt_interrupt(int irq, void *dev_id, struct pt_regs *regs)
printk(KERN_CRIT "Would Reboot.\n"); printk(KERN_CRIT "Would Reboot.\n");
#else #else
printk(KERN_CRIT "Initiating system reboot.\n"); printk(KERN_CRIT "Initiating system reboot.\n");
machine_restart(NULL); emergency_restart();
#endif #endif
#else #else
printk(KERN_CRIT "Reset in 5ms.\n"); printk(KERN_CRIT "Reset in 5ms.\n");

2
drivers/char/watchdog/wdt_pci.c
View file

@ -311,7 +311,7 @@ static irqreturn_t wdtpci_interrupt(int irq, void *dev_id, struct pt_regs *regs)
printk(KERN_CRIT PFX "Would Reboot.\n"); printk(KERN_CRIT PFX "Would Reboot.\n");
#else #else
printk(KERN_CRIT PFX "Initiating system reboot.\n"); printk(KERN_CRIT PFX "Initiating system reboot.\n");
machine_restart(NULL); emergency_restart(NULL);
#endif #endif
#else #else
printk(KERN_CRIT PFX "Reset in 5ms.\n"); printk(KERN_CRIT PFX "Reset in 5ms.\n");