projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MALI: utgard: upgrade DDK to r6p1-01rel0
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
panic.c
diff --git
a/kernel/panic.c
b/kernel/panic.c
index f07bfc9fe613b598fa88c681696bbc8838e1cd3b..41e2b54f36b5cdc73ecbda53a246662ba541ba57 100644
(file)
--- a/
kernel/panic.c
+++ b/
kernel/panic.c
@@
-28,9
+28,6
@@
#define PANIC_TIMER_STEP 100
#define PANIC_BLINK_SPD 18
#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;
int panic_on_oops = CONFIG_PANIC_ON_OOPS_VALUE;
static unsigned long tainted_mask;
static int pause_on_oops;
@@
-160,8
+157,7
@@
void panic(const char *fmt, ...)
* panic() is not being callled from OOPS.
*/
debug_locks_off();
* panic() is not being callled from OOPS.
*/
debug_locks_off();
- console_trylock();
- console_unlock();
+ console_flush_on_panic();
if (!panic_blink)
panic_blink = no_blink;
if (!panic_blink)
panic_blink = no_blink;
@@
-416,11
+412,6
@@
late_initcall(init_oops_id);
void print_oops_end_marker(void)
{
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);
}
pr_warn("---[ end trace %016llx ]---\n", (unsigned long long)oops_id);
}