Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 4 insertions, 5 deletions

diff --git a/kernel/panic.c b/kernel/panic.c
index 74ba5f3e46c7..aabc5f86fa3f 100644
--- a/kernel/panic.c
+++ b/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__
         {