Skip to content

Commit 14bda4e

Browse files
author
Peter Zijlstra
committed
Merge branch 'objtool/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jpoimboe/linux into objtool/core
2 parents b3a9e3b + fb41478 commit 14bda4e

File tree

8 files changed

+349
-229
lines changed

8 files changed

+349
-229
lines changed

tools/objtool/arch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,6 @@ bool arch_callee_saved_reg(unsigned char reg);
8282

8383
unsigned long arch_jump_destination(struct instruction *insn);
8484

85-
unsigned long arch_dest_rela_offset(int addend);
85+
unsigned long arch_dest_reloc_offset(int addend);
8686

8787
#endif /* _ARCH_H */

tools/objtool/arch/x86/decode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ bool arch_callee_saved_reg(unsigned char reg)
6767
}
6868
}
6969

70-
unsigned long arch_dest_rela_offset(int addend)
70+
unsigned long arch_dest_reloc_offset(int addend)
7171
{
7272
return addend + 4;
7373
}

0 commit comments

Comments
 (0)