Merge tag 'objtool-urgent-2020-04-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (9b3e59e3) · Commits · 戴 / test

Pull objtool fixes from Ingo Molnar: "Two fixes: fix an off-by-one bug, and fix 32-bit builds on 64-bit systems" * tag 'objtool-urgent-2020-04-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: objtool: Fix off-by-one in symbol_by_offset() objtool: Fix 32bit cross builds

tools/objtool/elf.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -105,7 +105,7 @@ static int symbol_by_offset(const void key, const struct rb_node node)

		if (*o < s->offset)
		return -1;
		if (*o > s->offset + s->len)
		if (*o >= s->offset + s->len)
		return 1;

		return 0;

tools/objtool/elf.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ static inline u32 sec_offset_hash(struct section *sec, unsigned long offset)
		offset &= OFFSET_STRIDE_MASK;

		ol = offset;
		oh = offset >> 32;
		oh = (offset >> 16) >> 16;

		__jhash_mix(ol, oh, idx);

Admin message