Merge branch 'objtool/urgent'
authorPeter Zijlstra <peterz@infradead.org>
Wed, 6 Oct 2021 22:40:17 +0000 (00:40 +0200)
committerPeter Zijlstra <peterz@infradead.org>
Wed, 6 Oct 2021 22:40:17 +0000 (00:40 +0200)
Fixup conflicts.

# Conflicts:
# tools/objtool/check.c

1  2 
arch/x86/kvm/svm/svm.h
arch/x86/xen/enlighten_pv.c
arch/x86/xen/mmu_pv.c
lib/Kconfig.debug
tools/objtool/arch/x86/decode.c
tools/objtool/check.c
tools/objtool/include/objtool/elf.h
tools/objtool/orc_gen.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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);
Simple merge
Simple merge