mm: Expose untagging mask in /proc/$PID/status

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

diff --git a/kernel/panic.c b/kernel/panic.c
index 487f5b0..5cfea83 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -212,9 +212,6 @@ static void panic_print_sys_info(bool console_flush)
                return;
        }
 
-       if (panic_print & PANIC_PRINT_ALL_CPU_BT)
-               trigger_all_cpu_backtrace();
-
        if (panic_print & PANIC_PRINT_TASK_INFO)
                show_state();
 
@@ -244,6 +241,30 @@ void check_panic_on_warn(const char *origin)
                      origin, limit);
 }
 
+/*
+ * Helper that triggers the NMI backtrace (if set in panic_print)
+ * and then performs the secondary CPUs shutdown - we cannot have
+ * the NMI backtrace after the CPUs are off!
+ */
+static void panic_other_cpus_shutdown(bool crash_kexec)
+{
+       if (panic_print & PANIC_PRINT_ALL_CPU_BT)
+               trigger_all_cpu_backtrace();
+
+       /*
+        * Note that smp_send_stop() is the usual SMP shutdown function,
+        * which unfortunately may not be hardened to work in a panic
+        * situation. If we want to do crash dump after notifier calls
+        * and kmsg_dump, we will need architecture dependent extra
+        * bits in addition to stopping other CPUs, hence we rely on
+        * crash_smp_send_stop() for that.
+        */
+       if (!crash_kexec)
+               smp_send_stop();
+       else
+               crash_smp_send_stop();
+}
+
 /**
  *     panic - halt the system
  *     @fmt: The text string to print
@@ -334,23 +355,10 @@ void panic(const char *fmt, ...)
         *
         * Bypass the panic_cpu check and call __crash_kexec directly.
         */
-       if (!_crash_kexec_post_notifiers) {
+       if (!_crash_kexec_post_notifiers)
                __crash_kexec(NULL);
 
-               /*
-                * 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();
-       } else {
-               /*
-                * If we want to do crash dump after notifier calls and
-                * kmsg_dump, we will need architecture dependent extra
-                * works in addition to stopping other CPUs.
-                */
-               crash_smp_send_stop();
-       }
+       panic_other_cpus_shutdown(_crash_kexec_post_notifiers);
 
        /*
         * Run any panic handlers, including those that might need to