Merge branch 'objtool/core' of git://git.kernel.org/pub/scm/linux/ker…

…nel/git/jpoimboe/linux into objtool/core
mariux64 · Jun 17, 2020 · 14bda4e · 14bda4e
2 parents b3a9e3b + fb41478
commit 14bda4e
Show file tree

Hide file tree

Showing 8 changed files with 349 additions and 229 deletions.
diff --git a/tools/objtool/arch.h b/tools/objtool/arch.h
@@ -82,6 +82,6 @@ bool arch_callee_saved_reg(unsigned char reg);
 
 unsigned long arch_jump_destination(struct instruction *insn);
 
-unsigned long arch_dest_rela_offset(int addend);
+unsigned long arch_dest_reloc_offset(int addend);
 
 #endif /* _ARCH_H */
diff --git a/tools/objtool/arch/x86/decode.c b/tools/objtool/arch/x86/decode.c
@@ -67,7 +67,7 @@ bool arch_callee_saved_reg(unsigned char reg)
 	}
 }
 
-unsigned long arch_dest_rela_offset(int addend)
+unsigned long arch_dest_reloc_offset(int addend)
 {
 	return addend + 4;
 }