patch-2.1.30 linux/drivers/char/softdog.c

Next file: linux/drivers/char/tty_io.c
Previous file: linux/drivers/char/serial.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.29/linux/drivers/char/softdog.c linux/drivers/char/softdog.c
@@ -33,6 +33,7 @@
 #include <linux/mm.h>
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
+#include <linux/reboot.h>
 #include <asm/uaccess.h>
 
 #define WATCHDOG_MINOR	130
@@ -54,12 +55,11 @@
  
 static void watchdog_fire(unsigned long data)
 {
-	extern void hard_reset_now(void);
 #ifdef ONLY_TESTING
 		printk(KERN_CRIT "SOFTDOG: Would Reboot.\n");
 #else
 	printk(KERN_CRIT "SOFTDOG: Initiating system reboot.\n");
-	hard_reset_now();
+	machine_restart(NULL);
 	printk("WATCHDOG: Reboot didn't ?????\n");
 #endif
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov