h63xx: tsc2101 alsa sound support

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

diff --git a/kernel/panic.c b/kernel/panic.c
index 74ba5f3e46c746059b044072b7bce99f53aa3551..126dc43f1c744a4d46e6e8d20610ac9f54744877 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -60,7 +60,7 @@ 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
 
@@ -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__
        {
@@ -126,11 +125,12 @@ NORET_TYPE void panic(const char * fmt, ...)
                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++;