diff options
author | John Stultz <john.stultz@linaro.org> | 2011-08-19 16:41:55 -0700 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2011-08-19 16:41:55 -0700 |
commit | d3828df964e542533765b23f9a343657c7860e17 (patch) | |
tree | a7c34aae8835dc9db8a0df8adafdffe9ea85f651 /kernel | |
parent | 7c52cc1dd1b8930107cce801a161df10b8a34275 (diff) | |
parent | efcf89c8eb62b7c0c5976cb94f892c891afea199 (diff) |
Merge branch 'upstream/android-3.0' into linaro-android-3.0
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/panic.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index 5578d0adc27..a136da2f396 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -27,6 +27,9 @@ #define PANIC_TIMER_STEP 100 #define PANIC_BLINK_SPD 18 +/* Machine specific panic information string */ +char *mach_panic_string; + int panic_on_oops; static unsigned long tainted_mask; static int pause_on_oops; @@ -345,6 +348,11 @@ late_initcall(init_oops_id); void print_oops_end_marker(void) { init_oops_id(); + + if (mach_panic_string) + printk(KERN_WARNING "Board Information: %s\n", + mach_panic_string); + printk(KERN_WARNING "---[ end trace %016llx ]---\n", (unsigned long long)oops_id); } |