Commit f82567e5 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds
Browse files

[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: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4de8b9b7

drivers/char/watchdog/eurotechwdt.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static irqreturn_t eurwdt_interrupt(int irq, void *dev_id, struct pt_regs *regs) 
	printk(KERN_CRIT "Would Reboot.\n");

#else

	printk(KERN_CRIT "Initiating system reboot.\n");

	machine_restart(NULL);

	emergency_restart(NULL);

#endif

	return IRQ_HANDLED;

}

drivers/char/watchdog/softdog.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

	}

}

drivers/char/watchdog/wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ static irqreturn_t wdt_interrupt(int irq, void *dev_id, struct pt_regs *regs) 
		printk(KERN_CRIT "Would Reboot.\n");

#else

		printk(KERN_CRIT "Initiating system reboot.\n");

		machine_restart(NULL);

		emergency_restart();

#endif

#else

		printk(KERN_CRIT "Reset in 5ms.\n");

drivers/char/watchdog/wdt_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

#else

		printk(KERN_CRIT PFX "Initiating system reboot.\n");

		machine_restart(NULL);

		emergency_restart(NULL);

#endif

#else

		printk(KERN_CRIT PFX "Reset in 5ms.\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE