[PATCH] uml: make tt mode-dependent options depend on MODE_TT

[safe/jmp/linux-2.6] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index 66f43d3..aabc5f8 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -83,7 +83,7 @@ NORET_TYPE void panic(const char * fmt, ...)
         * everything else.
         * Do we want to call this before we try to display a message?
         */
-       crash_kexec();
+       crash_kexec(NULL);
 
 #ifdef CONFIG_SMP
        /*
@@ -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__
        {