[X86] Remove unnecessary code in 64bit CPU identification.

From: Dave Jones
Date: Tue May 20 2008 - 00:09:57 EST


There were no 64bit Transmeta CPUs made (and it'd be something of
a surprise if they started any time soon). To the best of my knowledge,
no CPU vendor cloned the 80860000 cpuid space claimed by Transmeta.
By removing this code, we can also eliminate calling cpuid 0x80000007 twice.

Signed-off-by: Dave Jones <davej@xxxxxxxxxx>

diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index ff62838..0380726 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -1042,20 +1042,11 @@ static void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c)
}
if (xlvl >= 0x80000004)
get_model_name(c); /* Default name */
- }

- /* Transmeta-defined flags: level 0x80860001 */
- xlvl = cpuid_eax(0x80860000);
- if ((xlvl & 0xffff0000) == 0x80860000) {
- /* Don't set x86_cpuid_level here for now to not confuse. */
- if (xlvl >= 0x80860001)
- c->x86_capability[2] = cpuid_edx(0x80860001);
+ if (xlvl >= 0x80000007)
+ c->x86_power = cpuid_edx(0x80000007);
}

- c->extended_cpuid_level = cpuid_eax(0x80000000);
- if (c->extended_cpuid_level >= 0x80000007)
- c->x86_power = cpuid_edx(0x80000007);
-
switch (c->x86_vendor) {
case X86_VENDOR_AMD:
early_init_amd(c);


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/