Merge branch 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull x86 paravirt update from Ingo Molnar:
 "Various paravirtualization related changes - the biggest one makes
  guest support optional via CONFIG_HYPERVISOR_GUEST"

* 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, wakeup, sleep: Use pvops functions for changing GDT entries
  x86, xen, gdt: Remove the pvops variant of store_gdt.
  x86-32, gdt: Store/load GDT for ACPI S3 or hibernation/resume path is not needed
  x86-64, gdt: Store/load GDT for ACPI S3 or hibernate/resume path is not needed.
  x86: Make Linux guest support optional
  x86, Kconfig: Move PARAVIRT_DEBUG into the paravirt menu

diff --cc arch/x86/Kconfig
Simple merge

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

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

diff --cc arch/x86/kernel/acpi/wakeup_32.S
Simple merge

diff --cc arch/x86/kernel/cpu/Makefile
index deef0399fc7859962d9f8477b6218929d40abee4,5f81bcefbe14db8b7ea8f7e47ab528da868bb3f5..b0684e4a73aa60ae8edee4d3b729de2b663b079c
--- 1/arch/x86/kernel/cpu/Makefile
--- 2/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@@ -42,8 -41,10 +41,10 @@@ obj-$(CONFIG_MTRR)                  += mtrr
  
  obj-$(CONFIG_X86_LOCAL_APIC)          += perfctr-watchdog.o perf_event_amd_ibs.o
  
+ obj-$(CONFIG_HYPERVISOR_GUEST)                += vmware.o hypervisor.o mshyperv.o
+ 
  quiet_cmd_mkcapflags = MKCAP   $@
 -      cmd_mkcapflags = $(PERL) $(srctree)/$(src)/mkcapflags.pl $< $@
 +      cmd_mkcapflags = $(CONFIG_SHELL) $(srctree)/$(src)/mkcapflags.sh $< $@
  
  cpufeature = $(src)/../../include/asm/cpufeature.h
  

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

diff --cc arch/x86/power/cpu.c
Simple merge

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

diff --cc drivers/misc/Kconfig
Simple merge