Auto merge with /home/aegl/GIT/linus

7 files changed, 8 insertions, 8 deletions

diff --git a/drivers/char/hangcheck-timer.c b/drivers/char/hangcheck-timer.c
index 78e650fc5b41..81d811edf3c5 100644
--- a/drivers/char/hangcheck-timer.c
+++ b/drivers/char/hangcheck-timer.c
@@ -173,7 +173,7 @@ static void hangcheck_fire(unsigned long data)
                 }
                 if (hangcheck_reboot) {
                         printk(KERN_CRIT "Hangcheck: hangcheck is restarting the machine.\n");
-                        machine_restart(NULL);
+                        emergency_restart();
                 } else {
                         printk(KERN_CRIT "Hangcheck: hangcheck value past margin!\n");
                 }
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index 12d563c648f7..feb25158c8ee 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -115,7 +115,7 @@ static void sysrq_handle_reboot(int key, struct pt_regs *pt_regs,
                                 struct tty_struct *tty) 
 {
         local_irq_enable();
-        machine_restart(NULL);
+        emergency_restart();
 }
 
 static struct sysrq_key_op sysrq_reboot_op = {
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)
         printk(KERN_CRIT "Would Reboot.\n");
 #else
         printk(KERN_CRIT "Initiating system reboot.\n");
-        machine_restart(NULL);
+        emergency_restart();
 #endif
         return IRQ_HANDLED;
 }
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)
                         *status |= WDIOF_OVERHEAT;
                         if (temp_panic) {
                                 printk (KERN_INFO PFX "Temperature overheat trip!\n");
-                                machine_power_off();
+                                kernel_power_off();
                         }
                 }
         } else {
@@ -355,7 +355,7 @@ static int pcwd_get_status(int *status)
                         *status |= WDIOF_OVERHEAT;
                         if (temp_panic) {
                                 printk (KERN_INFO PFX "Temperature overheat trip!\n");
-                                machine_power_off();
+                                kernel_power_off();
                         }
                 }
         }
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)
         else
         {
                 printk(KERN_CRIT PFX "Initiating system reboot.\n");
-                machine_restart(NULL);
+                emergency_restart();
                 printk(KERN_CRIT PFX "Reboot didn't ?????\n");
         }
 }
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)
                 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");
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)
                 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");