summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2020-03-16 10:36:53 +0100
committerPeter Zijlstra <peterz@infradead.org>2020-03-25 18:28:29 +0100
commit53d20720bbc8718ef86fdfe53dec0accfb593ef8 (patch)
tree6faa114eafaaf237759e253acbbf28f1b7c6440a
parent2a362ecc3ec9632aeea4b9a9062db91b2bd9975a (diff)
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) <peterz@infradead.org> Reviewed-by: Miroslav Benes <mbenes@suse.cz> Acked-by: Josh Poimboeuf <jpoimboe@redhat.com> Link: https://lkml.kernel.org/r/20200324160924.558470724@infradead.org
-rw-r--r--tools/objtool/elf.c2
-rw-r--r--tools/objtool/elf.h2
-rw-r--r--tools/objtool/warn.h2
3 files changed, 3 insertions, 3 deletions
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;