Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+3 -3
+1 -1
tools/objtool/elf.c
··· 187 187 return NULL; 188 188 } 189 189 190 - struct symbol *find_containing_func(struct section *sec, unsigned long offset) 190 + struct symbol *find_func_containing(struct section *sec, unsigned long offset) 191 191 { 192 192 struct rb_node *node; 193 193
+1 -1
tools/objtool/elf.h
··· 91 91 struct rela *find_rela_by_dest(struct section *sec, unsigned long offset); 92 92 struct rela *find_rela_by_dest_range(struct section *sec, unsigned long offset, 93 93 unsigned int len); 94 - struct symbol *find_containing_func(struct section *sec, unsigned long offset); 94 + struct symbol *find_func_containing(struct section *sec, unsigned long offset); 95 95 struct section *elf_create_section(struct elf *elf, const char *name, size_t 96 96 entsize, int nr); 97 97 struct section *elf_create_rela_section(struct elf *elf, struct section *base);
+1 -1
tools/objtool/warn.h
··· 21 21 char *name, *str; 22 22 unsigned long name_off; 23 23 24 - func = find_containing_func(sec, offset); 24 + func = find_func_containing(sec, offset); 25 25 if (func) { 26 26 name = func->name; 27 27 name_off = offset - func->offset;