- Update Xen patches to 3.3-rc5 and c/s 1157.

[linux-flexiantxendom0-3.2.10.git] / arch / x86 / Kconfig.cpu

diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 3c57033..028a6cf 100644 (file)
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -6,7 +6,7 @@ choice
 
 config M386
        bool "386"
-       depends on X86_32 && !UML
+       depends on X86_32 && !UML && !XEN
        ---help---
          This is the processor type of your CPU. This information is used for
          optimizing purposes. In order to compile a kernel that can run on
@@ -47,7 +47,7 @@ config M386
 
 config M486
        bool "486"
-       depends on X86_32
+       depends on X86_32 && !XEN
        ---help---
          Select this for a 486 series processor, either Intel or one of the
          compatible processors from AMD, Cyrix, IBM, or Intel.  Includes DX,
@@ -56,7 +56,7 @@ config M486
 
 config M586
        bool "586/K5/5x86/6x86/6x86MX"
-       depends on X86_32
+       depends on X86_32 && !XEN
        ---help---
          Select this for an 586 or 686 series processor such as the AMD K5,
          the Cyrix 5x86, 6x86 and 6x86MX.  This choice does not
@@ -64,14 +64,14 @@ config M586
 
 config M586TSC
        bool "Pentium-Classic"
-       depends on X86_32
+       depends on X86_32 && !XEN
        ---help---
          Select this for a Pentium Classic processor with the RDTSC (Read
          Time Stamp Counter) instruction for benchmarking.
 
 config M586MMX
        bool "Pentium-MMX"
-       depends on X86_32
+       depends on X86_32 && !XEN
        ---help---
          Select this for a Pentium with the MMX graphics/multimedia
          extended instructions.
@@ -396,6 +396,7 @@ config X86_P6_NOP
 config X86_TSC
        def_bool y
        depends on ((MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MATOM) && !X86_NUMAQ) || X86_64
+       depends on !XEN
 
 config X86_CMPXCHG64
        def_bool y
@@ -441,7 +442,7 @@ config CPU_SUP_INTEL
 config CPU_SUP_CYRIX_32
        default y
        bool "Support Cyrix processors" if PROCESSOR_SELECT
-       depends on !64BIT
+       depends on !64BIT && !XEN
        ---help---
          This enables detection, tunings and quirks for Cyrix processors
 
@@ -495,7 +496,7 @@ config CPU_SUP_TRANSMETA_32
 config CPU_SUP_UMC_32
        default y
        bool "Support UMC processors" if PROCESSOR_SELECT
-       depends on !64BIT
+       depends on !64BIT && !XEN
        ---help---
          This enables detection, tunings and quirks for UMC processors