From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 24 Oct 2010 19:47:25 +0000 (-0700)
Subject: Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm
X-Git-Tag: v2.6.37-rc1~142
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=1765a1fe5d6f82c0eceb1ad10594cfc83759b6d0

Merge branch 'kvm-updates/2.6.37' of git://git./virt/kvm/kvm

* 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (321 commits)
  KVM: Drop CONFIG_DMAR dependency around kvm_iommu_map_pages
  KVM: Fix signature of kvm_iommu_map_pages stub
  KVM: MCE: Send SRAR SIGBUS directly
  KVM: MCE: Add MCG_SER_P into KVM_MCE_CAP_SUPPORTED
  KVM: fix typo in copyright notice
  KVM: Disable interrupts around get_kernel_ns()
  KVM: MMU: Avoid sign extension in mmu_alloc_direct_roots() pae root address
  KVM: MMU: move access code parsing to FNAME(walk_addr) function
  KVM: MMU: audit: check whether have unsync sps after root sync
  KVM: MMU: audit: introduce audit_printk to cleanup audit code
  KVM: MMU: audit: unregister audit tracepoints before module unloaded
  KVM: MMU: audit: fix vcpu's spte walking
  KVM: MMU: set access bit for direct mapping
  KVM: MMU: cleanup for error mask set while walk guest page table
  KVM: MMU: update 'root_hpa' out of loop in PAE shadow path
  KVM: x86 emulator: Eliminate compilation warning in x86_decode_insn()
  KVM: x86: Fix constant type in kvm_get_time_scale
  KVM: VMX: Add AX to list of registers clobbered by guest switch
  KVM guest: Move a printk that's using the clock before it's ready
  KVM: x86: TSC catchup mode
  ...
---

1765a1fe5d6f82c0eceb1ad10594cfc83759b6d0
diff --cc arch/x86/kvm/x86.c
index 6c2ecf0a806d,2e090784863a..2288ad829b32
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@@ -1991,14 -2244,13 +2244,14 @@@ static void do_cpuid_ent(struct kvm_cpu
  		0 /* Reserved */ | F(CX16) | 0 /* xTPR Update, PDCM */ |
  		0 /* Reserved, DCA */ | F(XMM4_1) |
  		F(XMM4_2) | F(X2APIC) | F(MOVBE) | F(POPCNT) |
 -		0 /* Reserved, AES */ | F(XSAVE) | 0 /* OSXSAVE */ | F(AVX);
 +		0 /* Reserved*/ | F(AES) | F(XSAVE) | 0 /* OSXSAVE */ | F(AVX) |
 +		F(F16C);
  	/* cpuid 0x80000001.ecx */
  	const u32 kvm_supported_word6_x86_features =
- 		F(LAHF_LM) | F(CMP_LEGACY) | F(SVM) | 0 /* ExtApicSpace */ |
+ 		F(LAHF_LM) | F(CMP_LEGACY) | 0 /*SVM*/ | 0 /* ExtApicSpace */ |
  		F(CR8_LEGACY) | F(ABM) | F(SSE4A) | F(MISALIGNSSE) |
 -		F(3DNOWPREFETCH) | 0 /* OSVW */ | 0 /* IBS */ | F(SSE5) |
 -		0 /* SKINIT */ | 0 /* WDT */;
 +		F(3DNOWPREFETCH) | 0 /* OSVW */ | 0 /* IBS */ | F(XOP) |
 +		0 /* SKINIT, WDT, LWP */ | F(FMA4) | F(TBM);
  
  	/* all calls to cpuid_count() should be made on the same cpu */
  	get_cpu();