diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-17 09:32:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-17 09:32:39 -0800 |
| commit | a6ac1f0af4b39f41fa69477cc44621c612403374 (patch) | |
| tree | 3bc30b01c4a98a53477db77a4171696899b60f61 /arch/x86/include | |
| parent | 508817e7cd8cb585148d12b5673202142ece2330 (diff) | |
| parent | 3e26f23091da06d02fa62da14c95f3688d27857c (diff) | |
| download | op-kernel-dev-a6ac1f0af4b39f41fa69477cc44621c612403374.zip op-kernel-dev-a6ac1f0af4b39f41fa69477cc44621c612403374.tar.gz | |
Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm
* 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: Fix preemption counter leak in kvm_timer_init()
KVM: enlarge number of possible CPUID leaves
KVM: SVM: Do not report xsave in supported cpuid
KVM: Fix OSXSAVE after migration
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/kvm_host.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 9e6fe39..f702f82 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -79,7 +79,7 @@ #define KVM_NUM_MMU_PAGES (1 << KVM_MMU_HASH_SHIFT) #define KVM_MIN_FREE_MMU_PAGES 5 #define KVM_REFILL_PAGES 25 -#define KVM_MAX_CPUID_ENTRIES 40 +#define KVM_MAX_CPUID_ENTRIES 80 #define KVM_NR_FIXED_MTRR_REGION 88 #define KVM_NR_VAR_MTRR 8 |
