aboutsummaryrefslogtreecommitdiff
path: root/kernel/panic.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-09-20 12:00:42 +0200
committerIngo Molnar <mingo@kernel.org>2013-09-20 12:01:01 +0200
commit40a0c68ca9b49fb3e7292c1bae035ba5bcb27903 (patch)
tree11682834d3442d4640c4464709a76a268869ffbd /kernel/panic.c
parentc61037e905a5cb74c7d786c35ee2cdbab9ed63af (diff)
parent7e3115ef5149fc502e3a2e80719dba54a8e7409d (diff)
Merge branch 'sched/urgent' into sched/core
Merge in the latest fixes before applying a dependent patch. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/panic.c')
-rw-r--r--kernel/panic.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/panic.c b/kernel/panic.c
index 80186460051..b6c482ccc5d 100644
--- 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)