bitkeeper revision 1.1159.187.79 (41c9f233PwUo9mluRGkYmQFYLqGgCA)

Allow full range of CPU configs in Linux 2.6. Most of them do
actually work. We can re-disable or fix any that turn out not to.

diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/Kconfig b/linux-2.6.9-xen-sparse/arch/xen/i386/Kconfig
index 02b89bcb9f1794e549ea006ff4d1fdf288c281eb..98d02d8914cb6cc2ed092d37f2f1214f8ddab9ed 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/i386/Kconfig
+++ b/linux-2.6.9-xen-sparse/arch/xen/i386/Kconfig
@@ -29,69 +29,69 @@ choice
        prompt "Processor family"
        default M686
 
-#config M386
-#      bool "386"
-#      ---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
-#        all x86 CPU types (albeit not optimally fast), you can specify
-#        "386" here.
-#
-#        The kernel will not necessarily run on earlier architectures than
-#        the one you have chosen, e.g. a Pentium optimized kernel will run on
-#        a PPro, but not necessarily on a i486.
-#
-#        Here are the settings recommended for greatest speed:
-#        - "386" for the AMD/Cyrix/Intel 386DX/DXL/SL/SLC/SX, Cyrix/TI
-#        486DLC/DLC2, UMC 486SX-S and NexGen Nx586.  Only "386" kernels
-#        will run on a 386 class machine.
-#        - "486" for the AMD/Cyrix/IBM/Intel 486DX/DX2/DX4 or
-#        SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or U5S.
-#        - "586" for generic Pentium CPUs lacking the TSC
-#        (time stamp counter) register.
-#        - "Pentium-Classic" for the Intel Pentium.
-#        - "Pentium-MMX" for the Intel Pentium MMX.
-#        - "Pentium-Pro" for the Intel Pentium Pro.
-#        - "Pentium-II" for the Intel Pentium II or pre-Coppermine Celeron.
-#        - "Pentium-III" for the Intel Pentium III or Coppermine Celeron.
-#        - "Pentium-4" for the Intel Pentium 4 or P4-based Celeron.
-#        - "K6" for the AMD K6, K6-II and K6-III (aka K6-3D).
-#        - "Athlon" for the AMD K7 family (Athlon/Duron/Thunderbird).
-#        - "Crusoe" for the Transmeta Crusoe series.
-#        - "Winchip-C6" for original IDT Winchip.
-#        - "Winchip-2" for IDT Winchip 2.
-#        - "Winchip-2A" for IDT Winchips with 3dNow! capabilities.
-#        - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3.
-#        - "VIA C3-2 for VIA C3-2 "Nehemiah" (model 9 and above).
-#
-#        If you don't know what to do, choose "386".
-
-#config M486
-#      bool "486"
-#      help
-#        Select this for a 486 series processor, either Intel or one of the
-#        compatible processors from AMD, Cyrix, IBM, or Intel.  Includes DX,
-#        DX2, and DX4 variants; also SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or
-#        U5S.
-
-#config M586
-#      bool "586/K5/5x86/6x86/6x86MX"
-#      help
-#        Select this for an 586 or 686 series processor such as the AMD K5,
-#        the Intel 5x86 or 6x86, or the Intel 6x86MX.  This choice does not
-#        assume the RDTSC (Read Time Stamp Counter) instruction.
-
-#config M586TSC
-#      bool "Pentium-Classic"
-#      help
-#        Select this for a Pentium Classic processor with the RDTSC (Read
-#        Time Stamp Counter) instruction for benchmarking.
-
-#config M586MMX
-#      bool "Pentium-MMX"
-#      help
-#        Select this for a Pentium with the MMX graphics/multimedia
-#        extended instructions.
+config M386
+       bool "386"
+       ---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
+         all x86 CPU types (albeit not optimally fast), you can specify
+         "386" here.
+
+         The kernel will not necessarily run on earlier architectures than
+         the one you have chosen, e.g. a Pentium optimized kernel will run on
+         a PPro, but not necessarily on a i486.
+
+         Here are the settings recommended for greatest speed:
+         - "386" for the AMD/Cyrix/Intel 386DX/DXL/SL/SLC/SX, Cyrix/TI
+         486DLC/DLC2, UMC 486SX-S and NexGen Nx586.  Only "386" kernels
+         will run on a 386 class machine.
+         - "486" for the AMD/Cyrix/IBM/Intel 486DX/DX2/DX4 or
+         SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or U5S.
+         - "586" for generic Pentium CPUs lacking the TSC
+         (time stamp counter) register.
+         - "Pentium-Classic" for the Intel Pentium.
+         - "Pentium-MMX" for the Intel Pentium MMX.
+         - "Pentium-Pro" for the Intel Pentium Pro.
+         - "Pentium-II" for the Intel Pentium II or pre-Coppermine Celeron.
+         - "Pentium-III" for the Intel Pentium III or Coppermine Celeron.
+         - "Pentium-4" for the Intel Pentium 4 or P4-based Celeron.
+         - "K6" for the AMD K6, K6-II and K6-III (aka K6-3D).
+         - "Athlon" for the AMD K7 family (Athlon/Duron/Thunderbird).
+         - "Crusoe" for the Transmeta Crusoe series.
+         - "Winchip-C6" for original IDT Winchip.
+         - "Winchip-2" for IDT Winchip 2.
+         - "Winchip-2A" for IDT Winchips with 3dNow! capabilities.
+         - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3.
+         - "VIA C3-2 for VIA C3-2 "Nehemiah" (model 9 and above).
+
+         If you don't know what to do, choose "386".
+
+config M486
+       bool "486"
+       help
+         Select this for a 486 series processor, either Intel or one of the
+         compatible processors from AMD, Cyrix, IBM, or Intel.  Includes DX,
+         DX2, and DX4 variants; also SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or
+         U5S.
+
+config M586
+       bool "586/K5/5x86/6x86/6x86MX"
+       help
+         Select this for an 586 or 686 series processor such as the AMD K5,
+         the Intel 5x86 or 6x86, or the Intel 6x86MX.  This choice does not
+         assume the RDTSC (Read Time Stamp Counter) instruction.
+
+config M586TSC
+       bool "Pentium-Classic"
+       help
+         Select this for a Pentium Classic processor with the RDTSC (Read
+         Time Stamp Counter) instruction for benchmarking.
+
+config M586MMX
+       bool "Pentium-MMX"
+       help
+         Select this for a Pentium with the MMX graphics/multimedia
+         extended instructions.
 
 config M686
        bool "Pentium-Pro"
@@ -160,28 +160,28 @@ config MCRUSOE
          like a 586 with TSC, and sets some GCC optimization flags (like a
          Pentium Pro with no alignment requirements).
 
-#config MWINCHIPC6
-#      bool "Winchip-C6"
-#      help
-#        Select this for an IDT Winchip C6 chip.  Linux and GCC
-#        treat this chip as a 586TSC with some extended instructions
-#        and alignment requirements.
+config MWINCHIPC6
+       bool "Winchip-C6"
+       help
+         Select this for an IDT Winchip C6 chip.  Linux and GCC
+         treat this chip as a 586TSC with some extended instructions
+         and alignment requirements.
 
-#config MWINCHIP2
-#      bool "Winchip-2"
-#      help
-#        Select this for an IDT Winchip-2.  Linux and GCC
-#        treat this chip as a 586TSC with some extended instructions
-#        and alignment requirements.
+config MWINCHIP2
+       bool "Winchip-2"
+       help
+         Select this for an IDT Winchip-2.  Linux and GCC
+         treat this chip as a 586TSC with some extended instructions
+         and alignment requirements.
 
-#config MWINCHIP3D
-#      bool "Winchip-2A/Winchip-3"
-#      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
-#        stores for this CPU, which can increase performance of some
-#        operations.
+config MWINCHIP3D
+       bool "Winchip-2A/Winchip-3"
+       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
+         stores for this CPU, which can increase performance of some
+         operations.
 
 config MCYRIXIII
        bool "CyrixIII/VIA-C3"