Home Home > GIT Browse
diff options
authorRobert Love <rml@tech9.net>2003-01-12 17:38:50 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2003-01-12 17:38:50 -0800
commite167c48b2b1b8487185f1026b9036409ee3fa1dd (patch)
parente524d3b6f2fd4bb188b9e3075b0f98a55ac7d2be (diff)
[PATCH] P4-based Celeron comments
As you mentioned, we do not correctly identify the P4-based Celeron in the kernel configuration help. Unfortunately, Intel has called all Celeron products simply "Celeron", so we call these "P4-based Celerons".
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 8886e24c4796..2d38729a5b36 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -120,7 +120,7 @@ config M386
- "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.
+ - "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.
@@ -183,11 +183,13 @@ config MPENTIUMIII
config MPENTIUM4
- bool "Pentium-4"
+ bool "Pentium-4/Celeron(P4-based)"
- Select this for Intel Pentium 4 chips. Presently these are
- treated almost like Pentium IIIs, but with a different cache
- shift.
+ Select this for Intel Pentium 4 chips. This includes both
+ the Pentium 4 and P4-based Celeron chips. This option
+ enables compile flags optimized for the chip, uses the
+ correct cache shift, and applies any applicable Pentium III
+ optimizations.
config MK6
bool "K6/K6-II/K6-III"