[tip: objtool/core] objtool: Use arch specific values in restore_reg()

[tip-bot2 for Julien Thierry]

The following commit has been merged into the objtool/core branch of tip:

Commit-ID:     da99afd93ae2dfbe99b1989b86b38b3f6976ee27
Gitweb:        https://git.kernel.org/tip/da99afd93ae2dfbe99b1989b86b38b3f6976ee27
Author:        Julien Thierry <jthierry@xxxxxxxxxx>
AuthorDate:    Fri, 27 Mar 2020 15:28:43 
Committer:     Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
CommitterDate: Tue, 14 Apr 2020 10:39:25 -05:00

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@xxxxxxx>
Signed-off-by: Julien Thierry <jthierry@xxxxxxxxxx>
Acked-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Reviewed-by: Miroslav Benes <mbenes@xxxxxxx>
Signed-off-by: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
---
 tools/objtool/check.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 34b3d7b..5044f4c 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -1504,8 +1504,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;
 }
 
 /*