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@infradead.org>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Reviewed-by: Alexandre Chartre <alexandre.chartre@oracle.com>
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Link: https://lkml.kernel.org/r/20200416115118.986441913@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/tools/objtool/arch.h b/tools/objtool/arch.h
index 55396dfe0d07b5c78d9f21c97174af73fa947531..561c3162d177e95ec19d11bd9eec0e1c121b51fb 100644 (file)
--- 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 32736383ead116209ebe6183b351e98a161594b9..f0d42ad7d5fffe1502a7c1eef6252d6a973ad35a 100644 (file)
--- 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 1a3e7b8079940b33c7c27c95d0d42ee3384b3fd7..6faf97666d6be547b582e98626bcac7e7a912991 100644 (file)
--- 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 464f10c0a5ac43236833818945268ff981df1771..538b462fe7ea9a2a641f1ff72088d18364a1a01b 100644 (file)
--- 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)