Merge branch 'objtool/urgent'

Fixup conflicts.

# Conflicts:
#	tools/objtool/check.c

diff --cc arch/x86/kvm/svm/svm.h
Simple merge

diff --cc arch/x86/xen/enlighten_pv.c
Simple merge

diff --cc arch/x86/xen/mmu_pv.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc tools/objtool/arch/x86/decode.c
Simple merge

diff --cc tools/objtool/check.c
index 84e59a97bab6b2a9048281f3f1f7db45329f965f,06b5c164ae9318150aacdfd23a9a0fd90df49e39..7c865a10372a23753024fc50aa7946c29f779bd7
--- 1/tools/objtool/check.c
--- 2/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);

diff --cc tools/objtool/include/objtool/elf.h
Simple merge

diff --cc tools/objtool/orc_gen.c
Simple merge