x86: fix bootup crash in native_read_tsc()
authorIngo Molnar <mingo@elte.hu>
Fri, 1 Feb 2008 22:45:18 +0000 (23:45 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Feb 2008 23:00:26 +0000 (10:00 +1100)
fix bootup crash in native_read_tsc() that was reported on an Athlon-XP
and bisected. The correct feature boundary for X86_FEATURE_MFENCE_RDTSC
is not XMM but XMM2.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Acked-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/x86/kernel/cpu/amd.c

index 06fa159232fd74b9520cb41a706f1d239e653572..693e353999cdfbda06f6dedf3ece288990ebffa9 100644 (file)
@@ -304,7 +304,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
        if (c->x86 < 6)
                clear_bit(X86_FEATURE_MCE, c->x86_capability);
 
        if (c->x86 < 6)
                clear_bit(X86_FEATURE_MCE, c->x86_capability);
 
-       if (cpu_has_xmm)
+       if (cpu_has_xmm2)
                set_bit(X86_FEATURE_MFENCE_RDTSC, c->x86_capability);
 }
 
                set_bit(X86_FEATURE_MFENCE_RDTSC, c->x86_capability);
 }