aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/watchdog
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/watchdog')
-rw-r--r--drivers/char/watchdog/eurotechwdt.c2
-rw-r--r--drivers/char/watchdog/pcwd.c4
-rw-r--r--drivers/char/watchdog/softdog.c2
-rw-r--r--drivers/char/watchdog/wdt.c2
-rw-r--r--drivers/char/watchdog/wdt_pci.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/watchdog/eurotechwdt.c b/drivers/char/watchdog/eurotechwdt.c
index d10e554a14d6..2a29a511df7f 100644
--- a/drivers/char/watchdog/eurotechwdt.c
+++ b/drivers/char/watchdog/eurotechwdt.c
@@ -167,7 +167,7 @@ static irqreturn_t eurwdt_interrupt(int irq, void *dev_id, struct pt_regs *regs)
167 printk(KERN_CRIT "Would Reboot.\n"); 167 printk(KERN_CRIT "Would Reboot.\n");
168#else 168#else
169 printk(KERN_CRIT "Initiating system reboot.\n"); 169 printk(KERN_CRIT "Initiating system reboot.\n");
170 machine_restart(NULL); 170 emergency_restart();
171#endif 171#endif
172 return IRQ_HANDLED; 172 return IRQ_HANDLED;
173} 173}
diff --git a/drivers/char/watchdog/pcwd.c b/drivers/char/watchdog/pcwd.c
index 592dca108866..6ebce3f2ef9c 100644
--- a/drivers/char/watchdog/pcwd.c
+++ b/drivers/char/watchdog/pcwd.c
@@ -344,7 +344,7 @@ static int pcwd_get_status(int *status)
344 *status |= WDIOF_OVERHEAT; 344 *status |= WDIOF_OVERHEAT;
345 if (temp_panic) { 345 if (temp_panic) {
346 printk (KERN_INFO PFX "Temperature overheat trip!\n"); 346 printk (KERN_INFO PFX "Temperature overheat trip!\n");
347 machine_power_off(); 347 kernel_power_off();
348 } 348 }
349 } 349 }
350 } else { 350 } else {
@@ -355,7 +355,7 @@ static int pcwd_get_status(int *status)
355 *status |= WDIOF_OVERHEAT; 355 *status |= WDIOF_OVERHEAT;
356 if (temp_panic) { 356 if (temp_panic) {
357 printk (KERN_INFO PFX "Temperature overheat trip!\n"); 357 printk (KERN_INFO PFX "Temperature overheat trip!\n");
358 machine_power_off(); 358 kernel_power_off();
359 } 359 }
360 } 360 }
361 } 361 }
diff --git a/drivers/char/watchdog/softdog.c b/drivers/char/watchdog/softdog.c
index 117903498a01..98c7578740e2 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();
101 printk(KERN_CRIT PFX "Reboot didn't ?????\n"); 101 printk(KERN_CRIT PFX "Reboot didn't ?????\n");
102 } 102 }
103} 103}
diff --git a/drivers/char/watchdog/wdt.c b/drivers/char/watchdog/wdt.c
index 5684aa379886..1210ca0c425b 100644
--- a/drivers/char/watchdog/wdt.c
+++ b/drivers/char/watchdog/wdt.c
@@ -266,7 +266,7 @@ static irqreturn_t wdt_interrupt(int irq, void *dev_id, struct pt_regs *regs)
266 printk(KERN_CRIT "Would Reboot.\n"); 266 printk(KERN_CRIT "Would Reboot.\n");
267#else 267#else
268 printk(KERN_CRIT "Initiating system reboot.\n"); 268 printk(KERN_CRIT "Initiating system reboot.\n");
269 machine_restart(NULL); 269 emergency_restart();
270#endif 270#endif
271#else 271#else
272 printk(KERN_CRIT "Reset in 5ms.\n"); 272 printk(KERN_CRIT "Reset in 5ms.\n");
diff --git a/drivers/char/watchdog/wdt_pci.c b/drivers/char/watchdog/wdt_pci.c
index 7651deda928c..c80cb77b92fb 100644
--- a/drivers/char/watchdog/wdt_pci.c
+++ b/drivers/char/watchdog/wdt_pci.c
@@ -311,7 +311,7 @@ static irqreturn_t wdtpci_interrupt(int irq, void *dev_id, struct pt_regs *regs)
311 printk(KERN_CRIT PFX "Would Reboot.\n"); 311 printk(KERN_CRIT PFX "Would Reboot.\n");
312#else 312#else
313 printk(KERN_CRIT PFX "Initiating system reboot.\n"); 313 printk(KERN_CRIT PFX "Initiating system reboot.\n");
314 machine_restart(NULL); 314 emergency_restart(NULL);
315#endif 315#endif
316#else 316#else
317 printk(KERN_CRIT PFX "Reset in 5ms.\n"); 317 printk(KERN_CRIT PFX "Reset in 5ms.\n");