[PATCH v3.1 18c/26] objtool: Rename struct cfi_state

From: Peter Zijlstra
Date: Wed Mar 25 2020 - 10:43:20 EST


Subject: objtool: Rename struct cfi_state
From: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Date: Wed Mar 25 15:34:50 CET 2020

There's going to be a new struct cfi_state, rename this one to make
place.

Signed-off-by: Peter Zijlstra (Intel) <peterz@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(-)

--- a/tools/objtool/arch.h
+++ b/tools/objtool/arch.h
@@ -66,7 +66,7 @@ struct stack_op {
struct op_src src;
};

-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,
--- a/tools/objtool/arch/x86/decode.c
+++ b/tools/objtool/arch/x86/decode.c
@@ -480,7 +480,7 @@ int arch_decode_instruction(struct elf *
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;

--- a/tools/objtool/cfi.h
+++ b/tools/objtool/cfi.h
@@ -35,7 +35,7 @@ struct cfi_reg {
int offset;
};

-struct cfi_state {
+struct cfi_init_state {
struct cfi_reg cfa;
struct cfi_reg regs[CFI_NUM_REGS];
};
--- 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)