The following commit has been merged into the objtool/core branch of tip: Commit-ID: 1079b70d332afdf5368804b0b95402822ba0a61d Gitweb: https://git.kernel.org/tip/1079b70d332afdf5368804b0b95402822ba0a61d Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx> AuthorDate: Wed, 25 Mar 2020 15:34:50 +01:00 Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx> CommitterDate: Wed, 22 Apr 2020 23:10:06 +02:00 objtool: Rename struct cfi_state There's going to be a new struct cfi_state, rename this one to make place. Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Reviewed-by: Miroslav Benes <mbenes@xxxxxxx> Reviewed-by: Alexandre Chartre <alexandre.chartre@xxxxxxxxxx> Acked-by: Josh Poimboeuf <jpoimboe@xxxxxxxxxx> Link: https://lkml.kernel.org/r/20200416115118.986441913@xxxxxxxxxxxxx --- tools/objtool/arch.h | 2 +- tools/objtool/arch/x86/decode.c | 2 +- tools/objtool/cfi.h | 2 +- tools/objtool/check.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/objtool/arch.h b/tools/objtool/arch.h index 55396df..561c316 100644 --- a/tools/objtool/arch.h +++ b/tools/objtool/arch.h @@ -70,7 +70,7 @@ struct stack_op { struct instruction; -void arch_initial_func_cfi_state(struct cfi_state *state); +void arch_initial_func_cfi_state(struct cfi_init_state *state); int arch_decode_instruction(struct elf *elf, struct section *sec, unsigned long offset, unsigned int maxlen, diff --git a/tools/objtool/arch/x86/decode.c b/tools/objtool/arch/x86/decode.c index 3273638..f0d42ad 100644 --- a/tools/objtool/arch/x86/decode.c +++ b/tools/objtool/arch/x86/decode.c @@ -512,7 +512,7 @@ int arch_decode_instruction(struct elf *elf, struct section *sec, return 0; } -void arch_initial_func_cfi_state(struct cfi_state *state) +void arch_initial_func_cfi_state(struct cfi_init_state *state) { int i; diff --git a/tools/objtool/cfi.h b/tools/objtool/cfi.h index 1a3e7b8..6faf976 100644 --- a/tools/objtool/cfi.h +++ b/tools/objtool/cfi.h @@ -18,7 +18,7 @@ struct cfi_reg { int offset; }; -struct cfi_state { +struct cfi_init_state { struct cfi_reg cfa; struct cfi_reg regs[CFI_NUM_REGS]; }; diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 7e67bdb..8bc525f 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -27,7 +27,7 @@ struct alternative { }; const char *objname; -struct cfi_state initial_func_cfi; +struct cfi_init_state initial_func_cfi; struct instruction *find_insn(struct objtool_file *file, struct section *sec, unsigned long offset)
![]() |