Merge branch 'pm-cpufreq'

[deliverable/linux.git] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index 8018646005144c4082da694b331a1f44964134d6..c00b4ceb39e8b151aab790e6b498247ea53a4aa6 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -123,10 +123,14 @@ void panic(const char *fmt, ...)
         */
        smp_send_stop();
 
-       kmsg_dump(KMSG_DUMP_PANIC);
-
+       /*
+        * Run any panic handlers, including those that might need to
+        * add information to the kmsg dump output.
+        */
        atomic_notifier_call_chain(&panic_notifier_list, 0, buf);
 
+       kmsg_dump(KMSG_DUMP_PANIC);
+
        bust_spinlocks(0);
 
        if (!panic_blink)
@@ -229,7 +233,7 @@ static const struct tnt tnts[] = {
  */
 const char *print_tainted(void)
 {
-       static char buf[ARRAY_SIZE(tnts) + sizeof("Tainted: ") + 1];
+       static char buf[ARRAY_SIZE(tnts) + sizeof("Tainted: ")];
 
        if (tainted_mask) {
                char *s;