Merge branch 'x86/paravirt' into x86/entry

Merge in the recent paravirt changes to resolve conflicts caused
by objtool annotations.

Conflicts:
	arch/x86/xen/xen-asm.S

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/parisc/Kconfig
Simple merge

diff --cc arch/powerpc/kernel/irq.c
Simple merge

diff --cc arch/sh/Kconfig
Simple merge

diff --cc arch/x86/entry/common.c
Simple merge

diff --cc arch/x86/entry/entry_64.S
Simple merge

diff --cc arch/x86/include/asm/idtentry.h
Simple merge

diff --cc arch/x86/kernel/apic/apic.c
Simple merge

diff --cc arch/x86/xen/xen-asm.S
Simple merge

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

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