From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed, 20 Feb 2008 17:20:08 +0000 (-0800)
Subject: x86: disable KVM for Voyager and friends
X-Git-Tag: v2.6.25-rc4~97^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a4e3f89c6b2cbe0b26c08ec63a8c34156eaae04;p=linux-2.6

x86: disable KVM for Voyager and friends

Most classic Pentiums don't have hardware virtualization extension,
and building kvm with Voyager, Visual Workstation, or NUMAQ
generates spurious failures.

Signed-off-by: Avi Kivity <avi@qumranet.com>
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 4a88cf7695..53800b80a2 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -21,7 +21,7 @@ config X86
 	select HAVE_IDE
 	select HAVE_OPROFILE
 	select HAVE_KPROBES
-	select HAVE_KVM
+	select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
 
 
 config GENERIC_LOCKBREAK