diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/objtool/check.c | 4 | ||||
| -rw-r--r-- | tools/objtool/include/objtool/elf.h | 2 | ||||
| -rw-r--r-- | tools/objtool/include/objtool/warn.h | 14 |
3 files changed, 6 insertions, 14 deletions
diff --git a/tools/objtool/check.c b/tools/objtool/check.c index bd0c78bfe90c..c8b3c8e7090c 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -3545,7 +3545,7 @@ static int validate_branch(struct objtool_file *file, struct symbol *func, WARN("%s() falls through to next function %s()", func->name, insn_func(insn)->name); - func->warnings++; + func->warned = 1; return 1; } @@ -4576,7 +4576,7 @@ static void disas_warned_funcs(struct objtool_file *file) char *funcs = NULL, *tmp; for_each_sym(file, sym) { - if (sym->warnings) { + if (sym->warned) { if (!funcs) { funcs = malloc(strlen(sym->name) + 1); if (!funcs) { diff --git a/tools/objtool/include/objtool/elf.h b/tools/objtool/include/objtool/elf.h index eba04392c6fd..c7c4e87ebe88 100644 --- a/tools/objtool/include/objtool/elf.h +++ b/tools/objtool/include/objtool/elf.h @@ -65,11 +65,11 @@ struct symbol { u8 return_thunk : 1; u8 fentry : 1; u8 profiling_func : 1; + u8 warned : 1; u8 embedded_insn : 1; u8 local_label : 1; u8 frame_pointer : 1; u8 ignore : 1; - u8 warnings : 2; struct list_head pv_target; struct reloc *relocs; }; diff --git a/tools/objtool/include/objtool/warn.h b/tools/objtool/include/objtool/warn.h index b29ac144e4f5..e3ad9b2caf87 100644 --- a/tools/objtool/include/objtool/warn.h +++ b/tools/objtool/include/objtool/warn.h @@ -57,22 +57,14 @@ static inline char *offstr(struct section *sec, unsigned long offset) free(_str); \ }) -#define WARN_LIMIT 2 - #define WARN_INSN(insn, format, ...) \ ({ \ struct instruction *_insn = (insn); \ - BUILD_BUG_ON(WARN_LIMIT > 2); \ - if (!_insn->sym || _insn->sym->warnings < WARN_LIMIT) { \ + if (!_insn->sym || !_insn->sym->warned) \ WARN_FUNC(format, _insn->sec, _insn->offset, \ ##__VA_ARGS__); \ - if (_insn->sym) \ - _insn->sym->warnings++; \ - } else if (_insn->sym && _insn->sym->warnings == WARN_LIMIT) { \ - WARN_FUNC("skipping duplicate warning(s)", \ - _insn->sec, _insn->offset); \ - _insn->sym->warnings++; \ - } \ + if (_insn->sym) \ + _insn->sym->warned = 1; \ }) #define BT_INSN(insn, format, ...) \ |