diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-20 08:08:02 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-20 08:08:02 +0100 |
| commit | 10c18c44a6494167e7a7ca3a3a61a67972017bdf (patch) | |
| tree | 20c3afe744b0d88783161169ec88e45a53662fe7 /lib/bug.c | |
| parent | 9e49e2447c6385e45c6fddd70d6c0e917e21b669 (diff) | |
| parent | 1b5f3ba415fe4cf8b8b39c8d104ed44cde330658 (diff) | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib/bug.c')
| -rw-r--r-- | lib/bug.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/bug.c b/lib/bug.c index c1b0fad31b10..1077366f496b 100644 --- a/lib/bug.c +++ b/lib/bug.c @@ -150,6 +150,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs) return BUG_TRAP_TYPE_NONE; bug = find_bug(bugaddr); + if (!bug) + return BUG_TRAP_TYPE_NONE; file = NULL; line = 0; @@ -191,7 +193,7 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs) if (file) pr_crit("kernel BUG at %s:%u!\n", file, line); else - pr_crit("Kernel BUG at %p [verbose debug info unavailable]\n", + pr_crit("Kernel BUG at %pB [verbose debug info unavailable]\n", (void *)bugaddr); return BUG_TRAP_TYPE_BUG; |