From 3098b0ccbe924c03bfa3b91ea3ea9fe80d5608ec Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Tue, 26 Jul 2005 11:53:19 -0600
Subject: [PATCH] --- yaml --- r: 5051 b: refs/heads/master c:
 f82567e55fcd25bb7addf2cfd8b79f36f409dc2e h: refs/heads/master i:   5049:
 28daf280aaca09c6dbda6eef5c6959d6c5c737e2   5047:
 2c692d21cef47e64da33864b69005ab1d6df800c v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/char/watchdog/eurotechwdt.c | 2 +-
 trunk/drivers/char/watchdog/softdog.c     | 2 +-
 trunk/drivers/char/watchdog/wdt.c         | 2 +-
 trunk/drivers/char/watchdog/wdt_pci.c     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e71848e73b8f..8958079ea37b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4de8b9b76017365572f778332d74fe050d9c8c2a
+refs/heads/master: f82567e55fcd25bb7addf2cfd8b79f36f409dc2e
diff --git a/trunk/drivers/char/watchdog/eurotechwdt.c b/trunk/drivers/char/watchdog/eurotechwdt.c
index d10e554a14d6..f1016e3ba117 100644
--- a/trunk/drivers/char/watchdog/eurotechwdt.c
+++ b/trunk/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(NULL);
 #endif
 	return IRQ_HANDLED;
 }
diff --git a/trunk/drivers/char/watchdog/softdog.c b/trunk/drivers/char/watchdog/softdog.c
index 117903498a01..0d93097f06b4 100644
--- a/trunk/drivers/char/watchdog/softdog.c
+++ b/trunk/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(NULL);
 		printk(KERN_CRIT PFX "Reboot didn't ?????\n");
 	}
 }
diff --git a/trunk/drivers/char/watchdog/wdt.c b/trunk/drivers/char/watchdog/wdt.c
index 5684aa379886..1210ca0c425b 100644
--- a/trunk/drivers/char/watchdog/wdt.c
+++ b/trunk/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/trunk/drivers/char/watchdog/wdt_pci.c b/trunk/drivers/char/watchdog/wdt_pci.c
index 7651deda928c..c80cb77b92fb 100644
--- a/trunk/drivers/char/watchdog/wdt_pci.c
+++ b/trunk/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");