linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index 3fea0f2..126dc43 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -19,17 +19,12 @@
 #include <linux/interrupt.h>
 #include <linux/nmi.h>
 #include <linux/kexec.h>
-#include <linux/crash_dump.h>
 
-int panic_timeout = 900;
-int panic_on_oops = 1;
+int panic_timeout;
+int panic_on_oops;
 int tainted;
-unsigned int crashed;
-int crash_dump_on;
-void (*dump_function_ptr)(const char *, const struct pt_regs *) = 0;
 
 EXPORT_SYMBOL(panic_timeout);
-EXPORT_SYMBOL(dump_function_ptr);
 
 struct notifier_block *panic_notifier_list;
 
@@ -55,8 +50,7 @@ EXPORT_SYMBOL(panic_blink);
  *     panic - halt the system
  *     @fmt: The text string to print
  *
- *     Display a message, then perform cleanups. Functions in the panic
- *     notifier list are called after the filesystem cache is flushed (when possible).
+ *     Display a message, then perform cleanups.
  *
  *     This function never returns.
  */
@@ -66,25 +60,37 @@ NORET_TYPE void panic(const char * fmt, ...)
        long i;
        static char buf[1024];
        va_list args;
-#if defined(CONFIG_ARCH_S390)
+#if defined(CONFIG_S390)
         unsigned long caller = (unsigned long) __builtin_return_address(0);
 #endif
 
+       /*
+        * It's possible to come here directly from a panic-assertion and not
+        * have preempt disabled. Some functions called from here want
+        * preempt to be disabled. No point enabling it later though...
+        */
+       preempt_disable();
+
        bust_spinlocks(1);
        va_start(args, fmt);
        vsnprintf(buf, sizeof(buf), fmt, args);
        va_end(args);
        printk(KERN_EMERG "Kernel panic - not syncing: %s\n",buf);
-       if (crashdump_func())
-               BUG();
        bust_spinlocks(0);
 
-       /* If we have crashed, perform a kexec reboot, for dump write-out */
-       crash_machine_kexec();
+       /*
+        * If we have crashed and we have a crash kernel loaded let it handle
+        * everything else.
+        * Do we want to call this before we try to display a message?
+        */
+       crash_kexec(NULL);
 
-        notifier_call_chain(&panic_notifier_list, 0, buf);
-       
 #ifdef CONFIG_SMP
+       /*
+        * Note smp_send_stop is the usual smp shutdown function, which
+        * unfortunately means it may not be hardened to work in a panic
+        * situation.
+        */
        smp_send_stop();
 #endif
 
@@ -93,50 +99,38 @@ NORET_TYPE void panic(const char * fmt, ...)
        if (!panic_blink)
                panic_blink = no_blink;
 
-       if (panic_timeout > 0)
-       {
+       if (panic_timeout > 0) {
                /*
                 * Delay timeout seconds before rebooting the machine. 
                 * We can't use the "normal" timers since we just panicked..
                 */
                printk(KERN_EMERG "Rebooting in %d seconds..",panic_timeout);
-#ifdef CONFIG_KEXEC
- {             
-               struct kimage *image;
-               image = xchg(&kexec_image, 0);
-               if (image) {
-                       printk(KERN_EMERG "by starting a new kernel ..\n");
-                       mdelay(panic_timeout*1000);
-                       machine_kexec(image);
-               }
- }
-#endif
                for (i = 0; i < panic_timeout*1000; ) {
                        touch_nmi_watchdog();
                        i += panic_blink(i);
                        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__
        {
                extern int stop_a_enabled;
-               /* Make sure the user can actually press L1-A */
+               /* Make sure the user can actually press Stop-A (L1-A) */
                stop_a_enabled = 1;
-               printk(KERN_EMERG "Press L1-A to return to the boot prom\n");
+               printk(KERN_EMERG "Press Stop-A (L1-A) to return to the boot prom\n");
        }
 #endif
-#if defined(CONFIG_ARCH_S390)
+#if defined(CONFIG_S390)
         disabled_wait(caller);
 #endif
        local_irq_enable();
        for (i = 0;;) {
+               touch_softlockup_watchdog();
                i += panic_blink(i);
                mdelay(1);
                i++;