diff options
| -rw-r--r-- | tools/objtool/builtin-check.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/objtool/builtin-check.c b/tools/objtool/builtin-check.c index 51da270758f0..fe248044415b 100644 --- a/tools/objtool/builtin-check.c +++ b/tools/objtool/builtin-check.c @@ -729,6 +729,11 @@ static bool has_valid_stack_frame(struct instruction *insn) (insn->state & STATE_FP_SETUP); } +static unsigned int frame_state(unsigned long state) +{ + return (state & (STATE_FP_SAVED | STATE_FP_SETUP)); +} + /* * Follow the branch starting at the given instruction, and recursively follow * any other branches (jumps). Meanwhile, track the frame pointer state at @@ -756,7 +761,7 @@ static int validate_branch(struct objtool_file *file, while (1) { if (insn->visited) { - if (insn->state != state) { + if (frame_state(insn->state) != frame_state(state)) { WARN_FUNC("frame pointer state mismatch", sec, insn->offset); warnings++; |