From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 30 Apr 2013 15:41:21 +0000 (-0700)
Subject: Merge branch 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~109
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=1e2f5b598aa56c3978c2e623f72e9656a565c6c9

Merge branch 'x86-paravirt-for-linus' of git://git./linux/kernel/git/tip/tip

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
---

1e2f5b598aa56c3978c2e623f72e9656a565c6c9
diff --cc arch/x86/kernel/cpu/Makefile
index deef0399fc78,5f81bcefbe14..b0684e4a73aa
--- a/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