diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2020-04-22 12:32:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-04-23 08:34:18 +0200 |
| commit | 0c98be8118221a8d3de572740f29dd02ed9686a5 (patch) | |
| tree | 91292423dcd2b917c6e1c1a9e277e0bcf6ac834a /tools/objtool | |
| parent | objtool: Rename elf_read() to elf_open_read() (diff) | |
| download | wireguard-linux-0c98be8118221a8d3de572740f29dd02ed9686a5.tar.xz wireguard-linux-0c98be8118221a8d3de572740f29dd02ed9686a5.zip | |
objtool: Constify arch_decode_instruction()
Mostly straightforward constification, except that WARN_FUNC()
needs a writable pointer while we have read-only pointers,
so deflect this to WARN().
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sami Tolvanen <samitolvanen@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20200422103205.61900-4-mingo@kernel.org
Diffstat (limited to 'tools/objtool')
| -rw-r--r-- | tools/objtool/arch.h | 2 | ||||
| -rw-r--r-- | tools/objtool/arch/x86/decode.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/objtool/arch.h b/tools/objtool/arch.h index 561c3162d177..445b8fa73ccb 100644 --- a/tools/objtool/arch.h +++ b/tools/objtool/arch.h @@ -72,7 +72,7 @@ struct instruction; void arch_initial_func_cfi_state(struct cfi_init_state *state); -int arch_decode_instruction(struct elf *elf, struct section *sec, +int arch_decode_instruction(const struct elf *elf, const struct section *sec, unsigned long offset, unsigned int maxlen, unsigned int *len, enum insn_type *type, unsigned long *immediate, diff --git a/tools/objtool/arch/x86/decode.c b/tools/objtool/arch/x86/decode.c index f0d42ad7d5ff..c45a0b4e0760 100644 --- a/tools/objtool/arch/x86/decode.c +++ b/tools/objtool/arch/x86/decode.c @@ -27,7 +27,7 @@ static unsigned char op_to_cfi_reg[][2] = { {CFI_DI, CFI_R15}, }; -static int is_x86_64(struct elf *elf) +static int is_x86_64(const struct elf *elf) { switch (elf->ehdr.e_machine) { case EM_X86_64: @@ -77,7 +77,7 @@ unsigned long arch_jump_destination(struct instruction *insn) return insn->offset + insn->len + insn->immediate; } -int arch_decode_instruction(struct elf *elf, struct section *sec, +int arch_decode_instruction(const struct elf *elf, const struct section *sec, unsigned long offset, unsigned int maxlen, unsigned int *len, enum insn_type *type, unsigned long *immediate, @@ -98,7 +98,7 @@ int arch_decode_instruction(struct elf *elf, struct section *sec, insn_get_length(&insn); if (!insn_complete(&insn)) { - WARN_FUNC("can't decode instruction", sec, offset); + WARN("can't decode instruction at %s:0x%lx", sec->name, offset); return -1; } |