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

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
...@@ -585,7 +585,7 @@ static int add_dead_ends(struct objtool_file *file) ...@@ -585,7 +585,7 @@ static int add_dead_ends(struct objtool_file *file)
struct section *rsec; struct section *rsec;
struct reloc *reloc; struct reloc *reloc;
struct instruction *insn; struct instruction *insn;
unsigned long offset; uint64_t offset;
/* /*
* Check for manually annotated dead ends. * Check for manually annotated dead ends.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment