Commit 8d7e7684 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'objtool_urgent_for_v6.9_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull objtool fix from Borislav Petkov:

 - Fix a format specifier build error in objtool during an x32 build

* tag 'objtool_urgent_for_v6.9_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  objtool: Fix compile failure when using the x32 compiler
parents 1aac9cb7 6205125b
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ static int add_dead_ends(struct objtool_file *file)
	struct section *rsec;
	struct reloc *reloc;
	struct instruction *insn;
	unsigned long offset;
	uint64_t offset;

	/*
	 * Check for manually annotated dead ends.