aboutsummaryrefslogtreecommitdiff
path: root/kernel/panic.c
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2011-03-09 17:24:48 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-03-09 17:24:48 -0700
commit0ffb81261428df3e9f4d32ed00a6bd385299bfcf (patch)
tree06bbc160842f90e0243e1b29dacd13242564e380 /kernel/panic.c
parent64b883c9d077d0d0f70685ab67a88dbcd1a72720 (diff)
parent01355eaa8f6aadbf113d9d75c59accc60c274144 (diff)
Merge remote branch 'aviksil-lttng/linaro' into linux-linaro-2.6.38-alt
Diffstat (limited to 'kernel/panic.c')
-rw-r--r--kernel/panic.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/panic.c b/kernel/panic.c
index 991bb87a1704..3fd05f5708ca 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -23,6 +23,9 @@
#include <linux/init.h>
#include <linux/nmi.h>
#include <linux/dmi.h>
+#include <trace/kernel.h>
+
+DEFINE_TRACE(kernel_panic);
#define PANIC_TIMER_STEP 100
#define PANIC_BLINK_SPD 18
@@ -64,6 +67,10 @@ NORET_TYPE void panic(const char * fmt, ...)
long i, i_next = 0;
int state = 0;
+ va_start(args, fmt);
+ trace_kernel_panic(fmt, args);
+ va_end(args);
+
/*
* It's possible to come here directly from a panic-assertion and
* not have preempt disabled. Some functions called from here want