From 53d20720bbc8718ef86fdfe53dec0accfb593ef8 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Mon, 16 Mar 2020 10:36:53 +0100 Subject: objtool: Rename find_containing_func() For consistency; we have: find_symbol_by_offset() / find_symbol_containing() find_func_by_offset() / find_containing_func() fix that. Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Miroslav Benes Acked-by: Josh Poimboeuf Link: https://lkml.kernel.org/r/20200324160924.558470724@infradead.org --- tools/objtool/elf.c | 2 +- tools/objtool/elf.h | 2 +- tools/objtool/warn.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/objtool') diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c index 3a8b42672655..07db4df18588 100644 --- a/tools/objtool/elf.c +++ b/tools/objtool/elf.c @@ -187,7 +187,7 @@ struct symbol *find_symbol_containing(struct section *sec, unsigned long offset) return NULL; } -struct symbol *find_containing_func(struct section *sec, unsigned long offset) +struct symbol *find_func_containing(struct section *sec, unsigned long offset) { struct rb_node *node; diff --git a/tools/objtool/elf.h b/tools/objtool/elf.h index e4a8d68f2ef7..d18f466829b0 100644 --- a/tools/objtool/elf.h +++ b/tools/objtool/elf.h @@ -91,7 +91,7 @@ struct symbol *find_symbol_containing(struct section *sec, unsigned long offset) struct rela *find_rela_by_dest(struct section *sec, unsigned long offset); struct rela *find_rela_by_dest_range(struct section *sec, unsigned long offset, unsigned int len); -struct symbol *find_containing_func(struct section *sec, unsigned long offset); +struct symbol *find_func_containing(struct section *sec, unsigned long offset); struct section *elf_create_section(struct elf *elf, const char *name, size_t entsize, int nr); struct section *elf_create_rela_section(struct elf *elf, struct section *base); diff --git a/tools/objtool/warn.h b/tools/objtool/warn.h index cbb0a02b7480..7799f60de80a 100644 --- a/tools/objtool/warn.h +++ b/tools/objtool/warn.h @@ -21,7 +21,7 @@ static inline char *offstr(struct section *sec, unsigned long offset) char *name, *str; unsigned long name_off; - func = find_containing_func(sec, offset); + func = find_func_containing(sec, offset); if (func) { name = func->name; name_off = offset - func->offset; -- cgit v1.2.3