Commit d52a86be authored by Linus Torvalds's avatar Linus Torvalds

Merge penguin:v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 346f2990 4dcd2e25
...@@ -232,15 +232,19 @@ static void __init init_intel(struct cpuinfo_x86 *c) ...@@ -232,15 +232,19 @@ static void __init init_intel(struct cpuinfo_x86 *c)
if (c->x86 == 6) { if (c->x86 == 6) {
switch (c->x86_model) { switch (c->x86_model) {
case 5: case 5:
if (l2 == 0) if (c->x86_mask == 0) {
p = "Celeron (Covington)"; if (l2 == 0)
if (l2 == 256) p = "Celeron (Covington)";
p = "Mobile Pentium II (Dixon)"; else if (l2 == 256)
p = "Mobile Pentium II (Dixon)";
}
break; break;
case 6: case 6:
if (l2 == 128) if (l2 == 128)
p = "Celeron (Mendocino)"; p = "Celeron (Mendocino)";
else if (c->x86_mask == 0 || c->x86_mask == 5)
p = "Celeron-A";
break; break;
case 8: case 8:
...@@ -350,6 +354,26 @@ static struct cpu_dev intel_cpu_dev __initdata = { ...@@ -350,6 +354,26 @@ static struct cpu_dev intel_cpu_dev __initdata = {
[8] "Mobile Pentium MMX" [8] "Mobile Pentium MMX"
} }
}, },
{ X86_VENDOR_INTEL, 6,
{
[0] "Pentium Pro A-step",
[1] "Pentium Pro",
[3] "Pentium II (Klamath)",
[4] "Pentium II (Deschutes)",
[5] "Pentium II (Deschutes)",
[6] "Mobile Pentium II",
[7] "Pentium III (Katmai)",
[8] "Pentium III (Coppermine)",
[10] "Pentium III (Cascades)",
[11] "Pentium III (Tualatin)",
}
},
{ X86_VENDOR_INTEL, 15,
{
[1] "Pentium 4 (Unknown)",
[5] "Pentium 4 (Foster)",
}
},
}, },
c_init: init_intel, c_init: init_intel,
c_identify: generic_identify, c_identify: generic_identify,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment