From: Peter Zijlstra <peterz@infradead.org>
Date: Wed, 6 Oct 2021 22:40:17 +0000 (+0200)
Subject: Merge branch 'objtool/urgent'
X-Git-Tag: v6.1-rc5~2808^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b08cadbd3b8721db738d9a00ef3ce3ed667e6d9c;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'objtool/urgent'

Fixup conflicts.

# Conflicts:
#	tools/objtool/check.c
---

b08cadbd3b8721db738d9a00ef3ce3ed667e6d9c
diff --cc tools/objtool/check.c
index 84e59a97bab6,06b5c164ae93..7c865a10372a
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@@ -382,8 -306,8 +382,8 @@@ static int decode_instructions(struct o
  			insn->sec = sec;
  			insn->offset = offset;
  
 -			ret = arch_decode_instruction(file->elf, sec, offset,
 +			ret = arch_decode_instruction(file, sec, offset,
- 						      sec->len - offset,
+ 						      sec->sh.sh_size - offset,
  						      &insn->len, &insn->type,
  						      &insn->immediate,
  						      &insn->stack_ops);