diff options
author | Ondrej Zary <linux@rainbow-software.org> | 2011-05-16 15:38:08 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-05-16 16:24:21 -0400 |
commit | 865be7a81071a77014c83cd01536c989eed362b4 (patch) | |
tree | 4fd71b4c50c40b174ea728f79a4301d765c4b88c /arch/x86/kernel/cpu | |
parent | eecaaba5b2e4ae762b4726fae2e3b22630e137ec (diff) |
x86, cpu: Fix detection of Celeron Covington stepping A1 and B0
Steppings A1 and B0 of Celeron Covington are currently misdetected as
Pentium II (Dixon). Fix it by removing the stepping check.
[ hpa: this fixes this specific bug... the CPUID documentation
specifies that the L2 cache size can disambiguate additional CPUs;
this patch does not fix that. ]
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Link: http://lkml.kernel.org/r/201105162138.15416.linux@rainbow-software.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r-- | arch/x86/kernel/cpu/intel.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index df86bc8c859d..32e86aa52743 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c | |||
@@ -400,12 +400,10 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c) | |||
400 | 400 | ||
401 | switch (c->x86_model) { | 401 | switch (c->x86_model) { |
402 | case 5: | 402 | case 5: |
403 | if (c->x86_mask == 0) { | 403 | if (l2 == 0) |
404 | if (l2 == 0) | 404 | p = "Celeron (Covington)"; |
405 | p = "Celeron (Covington)"; | 405 | else if (l2 == 256) |
406 | else if (l2 == 256) | 406 | p = "Mobile Pentium II (Dixon)"; |
407 | p = "Mobile Pentium II (Dixon)"; | ||
408 | } | ||
409 | break; | 407 | break; |
410 | 408 | ||
411 | case 6: | 409 | case 6: |