AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

bug: Remove redundant condition check in report_bug

Browse Source 
[ Upstream commit 3ad1a6cb0abc63d036fc866bd7c2c5983516dec5 ]

report_bug() will return early if it cannot find a bug corresponding to
the provided address. The subsequent test for the bug will always be
true so remove it.

Fixes: 1b4cfe3c0a ("lib/bug.c: exclude non-BUG/WARN exceptions from report_bug()")
Signed-off-by: Andrew Scull <ascull@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Acked-by: Will Deacon <will@kernel.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210318143311.839894-2-ascull@google.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Andrew Scull 2021-03-18 14:33:07 +00:00 committed by Greg Kroah-Hartman
parent faba97afdb
commit 556e75a0ae
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/bug.c
View File

@ -158,30 +158,27 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
file = NULL; file = NULL;
line = 0; line = 0;
warning = 0;
if (bug) {
#ifdef CONFIG_DEBUG_BUGVERBOSE #ifdef CONFIG_DEBUG_BUGVERBOSE
#ifndef CONFIG_GENERIC_BUG_RELATIVE_POINTERS #ifndef CONFIG_GENERIC_BUG_RELATIVE_POINTERS
file = bug->file; file = bug->file;
#else #else
file = (const char *)bug + bug->file_disp; file = (const char *)bug + bug->file_disp;
#endif #endif
line = bug->line; line = bug->line;
#endif #endif
warning = (bug->flags & BUGFLAG_WARNING) != 0; warning = (bug->flags & BUGFLAG_WARNING) != 0;
once = (bug->flags & BUGFLAG_ONCE) != 0; once = (bug->flags & BUGFLAG_ONCE) != 0;
done = (bug->flags & BUGFLAG_DONE) != 0; done = (bug->flags & BUGFLAG_DONE) != 0;
if (warning && once) { if (warning && once) {
if (done) if (done)
return BUG_TRAP_TYPE_WARN; return BUG_TRAP_TYPE_WARN;
/* /*
* Since this is the only store, concurrency is not an issue. * Since this is the only store, concurrency is not an issue.
*/ */
bug->flags |= BUGFLAG_DONE; bug->flags |= BUGFLAG_DONE;
}
} }
/* /*