From: Paolo Bonzini Date: Mon, 18 Aug 2014 14:39:48 +0000 (+0200) Subject: Revert "KVM: x86: Increase the number of fixed MTRR regs to 10" X-Git-Tag: firefly_0821_release~3679^2~1646 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d3cf5ab75bba12328cc3a3960ee1b2dff623960c;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Paolo Bonzini Signed-off-by: Greg Kroah-Hartman --- diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 8b320722de7a..f7f20f7fac3c 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