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>