diff options
| author | Oliver Pinter <oliver.pntr@gmail.com> | 2007-10-17 12:04:36 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 14:15:59 -0400 |
| commit | 75e3808b67f88cdd8c531dda3e00deb3623a3dac (patch) | |
| tree | 5eb3ee2b3f7b18ed4e77af4c7b52cc10ddcd528e /arch/x86_64 | |
| parent | fb893e99080f1a01397fcf8afc480163826b23d4 (diff) | |
x86: add cpu codenames for Kconfig.cpu
add cpu core name for arch/i386/Kconfig.cpu:Pentium 4 sections help
add Pentium D for arch/i386/Kconfig.cpu
add Pentium D for arch/x86_64/Kconfig
AK: Clarified some of the descriptions
[ tglx: arch/x86 adaptation ]
Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86_64')
| -rw-r--r-- | arch/x86_64/Kconfig | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index d681be88ae5d..85f958c2f555 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig | |||
| @@ -175,14 +175,12 @@ config MK8 | |||
| 175 | config MPSC | 175 | config MPSC |
| 176 | bool "Intel P4 / older Netburst based Xeon" | 176 | bool "Intel P4 / older Netburst based Xeon" |
| 177 | help | 177 | help |
| 178 | Optimize for Intel Pentium 4 and older Nocona/Dempsey Xeon CPUs | 178 | Optimize for Intel Pentium 4, Pentium D and older Nocona/Dempsey |
| 179 | with Intel Extended Memory 64 Technology(EM64T). For details see | 179 | Xeon CPUs with Intel 64bit which is compatible with x86-64. |
| 180 | <http://www.intel.com/technology/64bitextensions/>. | ||
| 181 | Note that the latest Xeons (Xeon 51xx and 53xx) are not based on the | 180 | Note that the latest Xeons (Xeon 51xx and 53xx) are not based on the |
| 182 | Netburst core and shouldn't use this option. You can distinguish them | 181 | Netburst core and shouldn't use this option. You can distinguish them |
| 183 | using the cpu family field | 182 | using the cpu family field |
| 184 | in /proc/cpuinfo. Family 15 is an older Xeon, Family 6 a newer one | 183 | in /proc/cpuinfo. Family 15 is an older Xeon, Family 6 a newer one. |
| 185 | (this rule only applies to systems that support EM64T) | ||
| 186 | 184 | ||
| 187 | config MCORE2 | 185 | config MCORE2 |
| 188 | bool "Intel Core2 / newer Xeon" | 186 | bool "Intel Core2 / newer Xeon" |
| @@ -190,8 +188,7 @@ config MCORE2 | |||
| 190 | Optimize for Intel Core2 and newer Xeons (51xx) | 188 | Optimize for Intel Core2 and newer Xeons (51xx) |
| 191 | You can distinguish the newer Xeons from the older ones using | 189 | You can distinguish the newer Xeons from the older ones using |
| 192 | the cpu family field in /proc/cpuinfo. 15 is an older Xeon | 190 | the cpu family field in /proc/cpuinfo. 15 is an older Xeon |
| 193 | (use CONFIG_MPSC then), 6 is a newer one. This rule only | 191 | (use CONFIG_MPSC then), 6 is a newer one. |
| 194 | applies to CPUs that support EM64T. | ||
| 195 | 192 | ||
| 196 | config GENERIC_CPU | 193 | config GENERIC_CPU |
| 197 | bool "Generic-x86-64" | 194 | bool "Generic-x86-64" |