From: Peter Zijlstra <peterz@infradead.org>
Date: Wed, 25 Mar 2020 15:34:50 +0100
Subject: objtool: Rename struct cfi_state
Git-commit: a3608f5954d07a40fb93764dc6d06195fa52eb14
Patch-mainline: v5.8-rc1
References: bsc#1202396
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>
Acked-by: Miroslav Benes <mbenes@suse.cz>
---
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
@@ -73,7 +73,7 @@ struct stack_op {
struct list_head list;
};
-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
@@ -488,7 +488,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
@@ -47,7 +47,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
@@ -37,7 +37,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)