diff --git a/[refs] b/[refs] index 08f0e432faef..72558e59ced2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3191248bf1bf6627c04c5624904df45e0a979ed +refs/heads/master: aa6299926950c8dfe2fea638276cad6def092bc9 diff --git a/trunk/arch/x86/kernel/cpu/amd.c b/trunk/arch/x86/kernel/cpu/amd.c index 06fa159232fd..693e353999cd 100644 --- a/trunk/arch/x86/kernel/cpu/amd.c +++ b/trunk/arch/x86/kernel/cpu/amd.c @@ -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 (cpu_has_xmm) + if (cpu_has_xmm2) set_bit(X86_FEATURE_MFENCE_RDTSC, c->x86_capability); }