i386: Allow KVM on i386 nonpae

[sfrench/cifs-2.6.git] / arch / i386 / Kconfig.cpu

diff --git a/arch/i386/Kconfig.cpu b/arch/i386/Kconfig.cpu
index dce6124cb842a8307625ef673b8d97c4c99007cd..11a24d54f27bb667696c8acf790b9e25f9dd8613 100644 (file)
--- a/arch/i386/Kconfig.cpu
+++ b/arch/i386/Kconfig.cpu
@@ -108,7 +108,7 @@ config MCORE2
        bool "Core 2/newer Xeon"
        help
          Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and 53xx)
-         CPUs. You can distingush newer from older Xeons by the CPU family
+         CPUs. You can distinguish newer from older Xeons by the CPU family
          in /proc/cpuinfo. Newer ones have 6.
 
 config MPENTIUM4
@@ -172,7 +172,7 @@ config MWINCHIP3D
        help
          Select this for an IDT Winchip-2A or 3.  Linux and GCC
          treat this chip as a 586TSC with some extended instructions
-         and alignment reqirements.  Also enable out of order memory
+         and alignment requirements.  Also enable out of order memory
          stores for this CPU, which can increase performance of some
          operations.
 
@@ -297,11 +297,6 @@ config X86_POPAD_OK
        depends on !M386
        default y
 
-config X86_CMPXCHG64
-       bool
-       depends on !M386 && !M486
-       default y
-
 config X86_ALIGNMENT_16
        bool
        depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
@@ -344,8 +339,8 @@ config X86_CMOV
        depends on (MK7 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7)
        default y
 
-config X86_MINIMUM_CPU_MODEL
+config X86_MINIMUM_CPU_FAMILY
        int
-       default "4" if X86_XADD || X86_CMPXCHG || X86_BSWAP
-       default "0"
+       default "4" if X86_XADD || X86_CMPXCHG || X86_BSWAP || X86_WP_WORKS_OK
+       default "3"