diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2016-07-31 17:07:46 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2016-08-18 18:56:03 +0530 |
| commit | ee665a37d5251d8af6e2904f08f7cfd6fd35ca72 (patch) | |
| tree | 6406804c4963601eb76e89a0a6418193df2f60ac | |
| parent | 58612bdce3a8c547ae648f035dbe15c476576bae (diff) | |
Revert "panic: Add board ID to panic output"
This reverts commit 4e09c510185cb4db2277ce81cce81b7aa06bea45.
I checked for the usage of this debug helper in AOSP common kernels as
well as vendor kernels (e.g exynos, msm, mediatek, omap, tegra, x86,
x86_64) hosted at https://android.googlesource.com/kernel/ and I found
out that other than few fairly obsolete Omap trees (for tuna & Glass)
and Exynos tree (for Manta), there is no active user of this debug
helper. So we can safely remove this helper code.
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
| -rw-r--r-- | include/linux/kernel.h | 4 | ||||
| -rw-r--r-- | kernel/panic.c | 8 |
2 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 2955e672391d..924853d33a13 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -830,8 +830,4 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } /* OTHER_WRITABLE? Generally considered a bad idea. */ \ BUILD_BUG_ON_ZERO((perms) & 2) + \ (perms)) - -/* To identify board information in panic logs, set this */ -extern char *mach_panic_string; - #endif diff --git a/kernel/panic.c b/kernel/panic.c index 223564d3e1f8..41e2b54f36b5 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -28,9 +28,6 @@ #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; @@ -415,11 +412,6 @@ 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); } |