diff options
| author | Iliyan Malchev <malchev@google.com> | 2011-08-23 09:01:13 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-08-23 09:01:13 -0700 |
| commit | c01d5f2d6bfa1c478d268f69b1e464fda2b7921d (patch) | |
| tree | 959334475f15c6dcd3cd5093aaea43e27d6dc087 /kernel | |
| parent | ee242fad399102752ff76397babf41eba0f0fff8 (diff) | |
| parent | d5511f877e8bc0f705d2eea1c1054e7f847bb226 (diff) | |
| download | kernel_samsung_tuna-c01d5f2d6bfa1c478d268f69b1e464fda2b7921d.zip kernel_samsung_tuna-c01d5f2d6bfa1c478d268f69b1e464fda2b7921d.tar.gz kernel_samsung_tuna-c01d5f2d6bfa1c478d268f69b1e464fda2b7921d.tar.bz2 | |
Merge branch 'android-3.0' into android-omap-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 5578d0a..a136da2 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); } |