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

---
 [refs]               | 2 +-
 trunk/kernel/panic.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index f69c5a0f14f1..3213b2f041b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff31977782a05504f2586ec9e3e5ab4b09a4c893
+refs/heads/master: 2f048ea81df94f72dee0d42b3d9b941c03b8c9c5
diff --git a/trunk/kernel/panic.c b/trunk/kernel/panic.c
index 74ba5f3e46c7..aabc5f86fa3f 100644
--- a/trunk/kernel/panic.c
+++ b/trunk/kernel/panic.c
@@ -111,12 +111,11 @@ NORET_TYPE void panic(const char * fmt, ...)
 			mdelay(1);
 			i++;
 		}
-		/*
-		 *	Should we run the reboot notifier. For the moment Im
-		 *	choosing not too. It might crash, be corrupt or do
-		 *	more harm than good for other reasons.
+		/*	This will not be a clean reboot, with everything
+		 *	shutting down.  But if there is a chance of
+		 *	rebooting the system it will be rebooted.
 		 */
-		machine_restart(NULL);
+		emergency_restart();
 	}
 #ifdef __sparc__
 	{