diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-04-07 21:38:47 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-04-07 21:38:47 +0800 |
commit | c2120827cd39cee55136f088d26a005664d48710 (patch) | |
tree | 8d8d7c35f1e8577c0542dfe375face0d287f0f53 /kernel/panic.c | |
parent | 5911f9c0e5c1882d95332a558b6dac4109143a9b (diff) | |
parent | 27fc106f94587eb63401b26d9526128eb42ce8aa (diff) |
Merge remote-tracking branch 'linux-linaro-lsk-v4.1-android-test' into linux-linaro-lsk-v4.1-android
Diffstat (limited to 'kernel/panic.c')
-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 a4f7820f5930..3c329009f9be 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -28,6 +28,9 @@ #define PANIC_TIMER_STEP 100 #define PANIC_BLINK_SPD 18 +/* Machine specific panic information string */ +char *mach_panic_string; + int panic_on_oops = CONFIG_PANIC_ON_OOPS_VALUE; static unsigned long tainted_mask; static int pause_on_oops; @@ -411,6 +414,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); + pr_warn("---[ end trace %016llx ]---\n", (unsigned long long)oops_id); } |