objtool: Use arch specific values in restore_reg()

The initial register state is set up by arch specific code. Use the
value the arch code has set when restoring registers from the stack.

Suggested-by: Raphael Gault <raphael.gault@arm.com>
Signed-off-by: Julien Thierry <jthierry@redhat.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index efb9640135527c493bab7049340852fb879d0dd2..229d61eba17602832ed3f856149e0f01669af357 100644 (file)
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -1486,8 +1486,8 @@ static void save_reg(struct insn_state *state, unsigned char reg, int base,
 
 static void restore_reg(struct insn_state *state, unsigned char reg)
 {
-       state->regs[reg].base = CFI_UNDEFINED;
-       state->regs[reg].offset = 0;
+       state->regs[reg].base = initial_func_cfi.regs[reg].base;
+       state->regs[reg].offset = initial_func_cfi.regs[reg].offset;
 }
 
 /*