Commit 53d20720 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

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: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarMiroslav Benes <mbenes@suse.cz>
Acked-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Link: https://lkml.kernel.org/r/20200324160924.558470724@infradead.org
parent 2a362ecc

tools/objtool/elf.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

tools/objtool/elf.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

tools/objtool/warn.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE