ia64/xen-unstable

changeset 3323:ddc28d82a044

bitkeeper revision 1.1159.1.502 (41c9f250UPMNaCe07pXLSQ_YQhUUnw)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Wed Dec 22 22:16:48 2004 +0000 (2004-12-22)
parents fb44ce115c8e 01c9d6eb4af5
children c8def7019487
files linux-2.6.9-xen-sparse/arch/xen/i386/Kconfig
line diff
     1.1 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/Kconfig	Wed Dec 22 20:09:53 2004 +0000
     1.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/Kconfig	Wed Dec 22 22:16:48 2004 +0000
     1.3 @@ -29,69 +29,69 @@ choice
     1.4  	prompt "Processor family"
     1.5  	default M686
     1.6  
     1.7 -#config M386
     1.8 -#	bool "386"
     1.9 -#	---help---
    1.10 -#	  This is the processor type of your CPU. This information is used for
    1.11 -#	  optimizing purposes. In order to compile a kernel that can run on
    1.12 -#	  all x86 CPU types (albeit not optimally fast), you can specify
    1.13 -#	  "386" here.
    1.14 -#
    1.15 -#	  The kernel will not necessarily run on earlier architectures than
    1.16 -#	  the one you have chosen, e.g. a Pentium optimized kernel will run on
    1.17 -#	  a PPro, but not necessarily on a i486.
    1.18 -#
    1.19 -#	  Here are the settings recommended for greatest speed:
    1.20 -#	  - "386" for the AMD/Cyrix/Intel 386DX/DXL/SL/SLC/SX, Cyrix/TI
    1.21 -#	  486DLC/DLC2, UMC 486SX-S and NexGen Nx586.  Only "386" kernels
    1.22 -#	  will run on a 386 class machine.
    1.23 -#	  - "486" for the AMD/Cyrix/IBM/Intel 486DX/DX2/DX4 or
    1.24 -#	  SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or U5S.
    1.25 -#	  - "586" for generic Pentium CPUs lacking the TSC
    1.26 -#	  (time stamp counter) register.
    1.27 -#	  - "Pentium-Classic" for the Intel Pentium.
    1.28 -#	  - "Pentium-MMX" for the Intel Pentium MMX.
    1.29 -#	  - "Pentium-Pro" for the Intel Pentium Pro.
    1.30 -#	  - "Pentium-II" for the Intel Pentium II or pre-Coppermine Celeron.
    1.31 -#	  - "Pentium-III" for the Intel Pentium III or Coppermine Celeron.
    1.32 -#	  - "Pentium-4" for the Intel Pentium 4 or P4-based Celeron.
    1.33 -#	  - "K6" for the AMD K6, K6-II and K6-III (aka K6-3D).
    1.34 -#	  - "Athlon" for the AMD K7 family (Athlon/Duron/Thunderbird).
    1.35 -#	  - "Crusoe" for the Transmeta Crusoe series.
    1.36 -#	  - "Winchip-C6" for original IDT Winchip.
    1.37 -#	  - "Winchip-2" for IDT Winchip 2.
    1.38 -#	  - "Winchip-2A" for IDT Winchips with 3dNow! capabilities.
    1.39 -#	  - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3.
    1.40 -#	  - "VIA C3-2 for VIA C3-2 "Nehemiah" (model 9 and above).
    1.41 -#
    1.42 -#	  If you don't know what to do, choose "386".
    1.43 +config M386
    1.44 +	bool "386"
    1.45 +	---help---
    1.46 +	  This is the processor type of your CPU. This information is used for
    1.47 +	  optimizing purposes. In order to compile a kernel that can run on
    1.48 +	  all x86 CPU types (albeit not optimally fast), you can specify
    1.49 +	  "386" here.
    1.50 +
    1.51 +	  The kernel will not necessarily run on earlier architectures than
    1.52 +	  the one you have chosen, e.g. a Pentium optimized kernel will run on
    1.53 +	  a PPro, but not necessarily on a i486.
    1.54  
    1.55 -#config M486
    1.56 -#	bool "486"
    1.57 -#	help
    1.58 -#	  Select this for a 486 series processor, either Intel or one of the
    1.59 -#	  compatible processors from AMD, Cyrix, IBM, or Intel.  Includes DX,
    1.60 -#	  DX2, and DX4 variants; also SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or
    1.61 -#	  U5S.
    1.62 +	  Here are the settings recommended for greatest speed:
    1.63 +	  - "386" for the AMD/Cyrix/Intel 386DX/DXL/SL/SLC/SX, Cyrix/TI
    1.64 +	  486DLC/DLC2, UMC 486SX-S and NexGen Nx586.  Only "386" kernels
    1.65 +	  will run on a 386 class machine.
    1.66 +	  - "486" for the AMD/Cyrix/IBM/Intel 486DX/DX2/DX4 or
    1.67 +	  SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or U5S.
    1.68 +	  - "586" for generic Pentium CPUs lacking the TSC
    1.69 +	  (time stamp counter) register.
    1.70 +	  - "Pentium-Classic" for the Intel Pentium.
    1.71 +	  - "Pentium-MMX" for the Intel Pentium MMX.
    1.72 +	  - "Pentium-Pro" for the Intel Pentium Pro.
    1.73 +	  - "Pentium-II" for the Intel Pentium II or pre-Coppermine Celeron.
    1.74 +	  - "Pentium-III" for the Intel Pentium III or Coppermine Celeron.
    1.75 +	  - "Pentium-4" for the Intel Pentium 4 or P4-based Celeron.
    1.76 +	  - "K6" for the AMD K6, K6-II and K6-III (aka K6-3D).
    1.77 +	  - "Athlon" for the AMD K7 family (Athlon/Duron/Thunderbird).
    1.78 +	  - "Crusoe" for the Transmeta Crusoe series.
    1.79 +	  - "Winchip-C6" for original IDT Winchip.
    1.80 +	  - "Winchip-2" for IDT Winchip 2.
    1.81 +	  - "Winchip-2A" for IDT Winchips with 3dNow! capabilities.
    1.82 +	  - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3.
    1.83 +	  - "VIA C3-2 for VIA C3-2 "Nehemiah" (model 9 and above).
    1.84 +
    1.85 +	  If you don't know what to do, choose "386".
    1.86  
    1.87 -#config M586
    1.88 -#	bool "586/K5/5x86/6x86/6x86MX"
    1.89 -#	help
    1.90 -#	  Select this for an 586 or 686 series processor such as the AMD K5,
    1.91 -#	  the Intel 5x86 or 6x86, or the Intel 6x86MX.  This choice does not
    1.92 -#	  assume the RDTSC (Read Time Stamp Counter) instruction.
    1.93 +config M486
    1.94 +	bool "486"
    1.95 +	help
    1.96 +	  Select this for a 486 series processor, either Intel or one of the
    1.97 +	  compatible processors from AMD, Cyrix, IBM, or Intel.  Includes DX,
    1.98 +	  DX2, and DX4 variants; also SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or
    1.99 +	  U5S.
   1.100  
   1.101 -#config M586TSC
   1.102 -#	bool "Pentium-Classic"
   1.103 -#	help
   1.104 -#	  Select this for a Pentium Classic processor with the RDTSC (Read
   1.105 -#	  Time Stamp Counter) instruction for benchmarking.
   1.106 +config M586
   1.107 +	bool "586/K5/5x86/6x86/6x86MX"
   1.108 +	help
   1.109 +	  Select this for an 586 or 686 series processor such as the AMD K5,
   1.110 +	  the Intel 5x86 or 6x86, or the Intel 6x86MX.  This choice does not
   1.111 +	  assume the RDTSC (Read Time Stamp Counter) instruction.
   1.112  
   1.113 -#config M586MMX
   1.114 -#	bool "Pentium-MMX"
   1.115 -#	help
   1.116 -#	  Select this for a Pentium with the MMX graphics/multimedia
   1.117 -#	  extended instructions.
   1.118 +config M586TSC
   1.119 +	bool "Pentium-Classic"
   1.120 +	help
   1.121 +	  Select this for a Pentium Classic processor with the RDTSC (Read
   1.122 +	  Time Stamp Counter) instruction for benchmarking.
   1.123 +
   1.124 +config M586MMX
   1.125 +	bool "Pentium-MMX"
   1.126 +	help
   1.127 +	  Select this for a Pentium with the MMX graphics/multimedia
   1.128 +	  extended instructions.
   1.129  
   1.130  config M686
   1.131  	bool "Pentium-Pro"
   1.132 @@ -160,28 +160,28 @@ config MCRUSOE
   1.133  	  like a 586 with TSC, and sets some GCC optimization flags (like a
   1.134  	  Pentium Pro with no alignment requirements).
   1.135  
   1.136 -#config MWINCHIPC6
   1.137 -#	bool "Winchip-C6"
   1.138 -#	help
   1.139 -#	  Select this for an IDT Winchip C6 chip.  Linux and GCC
   1.140 -#	  treat this chip as a 586TSC with some extended instructions
   1.141 -#	  and alignment requirements.
   1.142 +config MWINCHIPC6
   1.143 +	bool "Winchip-C6"
   1.144 +	help
   1.145 +	  Select this for an IDT Winchip C6 chip.  Linux and GCC
   1.146 +	  treat this chip as a 586TSC with some extended instructions
   1.147 +	  and alignment requirements.
   1.148  
   1.149 -#config MWINCHIP2
   1.150 -#	bool "Winchip-2"
   1.151 -#	help
   1.152 -#	  Select this for an IDT Winchip-2.  Linux and GCC
   1.153 -#	  treat this chip as a 586TSC with some extended instructions
   1.154 -#	  and alignment requirements.
   1.155 +config MWINCHIP2
   1.156 +	bool "Winchip-2"
   1.157 +	help
   1.158 +	  Select this for an IDT Winchip-2.  Linux and GCC
   1.159 +	  treat this chip as a 586TSC with some extended instructions
   1.160 +	  and alignment requirements.
   1.161  
   1.162 -#config MWINCHIP3D
   1.163 -#	bool "Winchip-2A/Winchip-3"
   1.164 -#	help
   1.165 -#	  Select this for an IDT Winchip-2A or 3.  Linux and GCC
   1.166 -#	  treat this chip as a 586TSC with some extended instructions
   1.167 -#	  and alignment reqirements.  Also enable out of order memory
   1.168 -#	  stores for this CPU, which can increase performance of some
   1.169 -#	  operations.
   1.170 +config MWINCHIP3D
   1.171 +	bool "Winchip-2A/Winchip-3"
   1.172 +	help
   1.173 +	  Select this for an IDT Winchip-2A or 3.  Linux and GCC
   1.174 +	  treat this chip as a 586TSC with some extended instructions
   1.175 +	  and alignment reqirements.  Also enable out of order memory
   1.176 +	  stores for this CPU, which can increase performance of some
   1.177 +	  operations.
   1.178  
   1.179  config MCYRIXIII
   1.180  	bool "CyrixIII/VIA-C3"