diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
| commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
| tree | 5085c389f09da78182b899d19fe1068b619a69dd /arch/i386/kernel/setup.c | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'arch/i386/kernel/setup.c')
| -rw-r--r-- | arch/i386/kernel/setup.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index 202de42d7..c0721b482 100644 --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c @@ -11,7 +11,7 @@ * Zoltan Boszormenyi <zboszor@mol.hu> February 1999. * * Force Centaur C6 processors to report MTRR capability. - * Bart Hartgers <bart@etpmod.phys.tue.nl>, May 199. + * Bart Hartgers <bart@etpmod.phys.tue.nl>, May 1999. * * Intel Mobile Pentium II detection fix. Sean Gilley, June 1999. */ @@ -690,8 +690,8 @@ static struct cpu_model_info cpu_models[] __initdata = { NULL, NULL, NULL, NULL }}, { X86_VENDOR_INTEL, 6, { "Pentium Pro A-step", "Pentium Pro", NULL, "Pentium II (Klamath)", - NULL, "Pentium II (Deschutes)", "Mobile Pentium II", NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }}, + NULL, "Pentium II (Deschutes)", "Mobile Pentium II", "Pentium III (Katmai)", + "Pentium III (Coppermine)", NULL, NULL, NULL, NULL, NULL, NULL }}, { X86_VENDOR_AMD, 4, { NULL, NULL, NULL, "486 DX/2", NULL, NULL, NULL, "486 DX/2-WB", "486 DX/4", "486 DX/4-WB", NULL, NULL, NULL, NULL, "Am5x86-WT", @@ -799,16 +799,15 @@ __initfunc(void identify_cpu(struct cpuinfo_x86 *c)) /* Names for the Pentium II Celeron processors detectable only by also checking the cache size */ if ((cpu_models[i].vendor == X86_VENDOR_INTEL) - && (cpu_models[i].x86 == 6)){ - if(c->x86_model == 6 && c->x86_cache_size == 128) { + && (cpu_models[i].x86 == 6)) + { + if(c->x86_model == 5 && c->x86_cache_size == 0) + p = "Celeron (Covington)"; + else if(c->x86_model == 6 && c->x86_cache_size == 128) p = "Celeron (Mendocino)"; - } - else { - if (c->x86_model == 5 && c->x86_cache_size == 0) { - p = "Celeron (Covington)"; - } - } - } + else if(c->x86_model == 5 && c->x86_cache_size == 256) + p = "Celeron (Dixon)"; + } } } |