summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-08-18 16:39:48 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-05 16:28:35 -0700
commitd3cf5ab75bba12328cc3a3960ee1b2dff623960c (patch)
tree2e7c738e31e7a42d8096273606e7d4a9e4781613 /arch/x86
parentd175e30c03decba32c5373379f5bab065267a074 (diff)
downloadlinux-3.10-d3cf5ab75bba12328cc3a3960ee1b2dff623960c.tar.gz
linux-3.10-d3cf5ab75bba12328cc3a3960ee1b2dff623960c.tar.bz2
linux-3.10-d3cf5ab75bba12328cc3a3960ee1b2dff623960c.zip
Revert "KVM: x86: Increase the number of fixed MTRR regs to 10"
commit 0d234daf7e0a3290a3a20c8087eefbd6335a5bd4 upstream. This reverts commit 682367c494869008eb89ef733f196e99415ae862, which causes 32-bit SMP Windows 7 guests to panic. SeaBIOS has a limit on the number of MTRRs that it can handle, and this patch exceeded the limit. Better revert it. Thanks to Nadav Amit for debugging the cause. Reported-by: Wanpeng Li <wanpeng.li@linux.intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/include/asm/kvm_host.h2
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 8b320722de7..f7f20f7fac3 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -92,7 +92,7 @@
#define KVM_REFILL_PAGES 25
#define KVM_MAX_CPUID_ENTRIES 80
#define KVM_NR_FIXED_MTRR_REGION 88
-#define KVM_NR_VAR_MTRR 10
+#define KVM_NR_VAR_MTRR 8
#define ASYNC_PF_PER_VCPU 64