From 4369807abe88f16e85cffee5de2ebdb31681ab59 Mon Sep 17 00:00:00 2001 From: Boris Ostrovsky Date: Thu, 26 May 2011 11:19:52 -0400 Subject: [PATCH] --- yaml --- r: 252695 b: refs/heads/master c: e9cdd343a5e42c43bcda01e609fa23089e026470 h: refs/heads/master i: 252693: 72cc2f871055491e66faa194adc231a13109ed35 252691: a94a7b1939369005dee8004f839b116b6518656c 252687: 4f6cc4fe7a99dca19c779a559113e54f4ff73837 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/amd.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ac0606847dba..2cd3df3b3d9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b80ef10e84d85a06bcd0b3a24a752ec32d0e0e40 +refs/heads/master: e9cdd343a5e42c43bcda01e609fa23089e026470 diff --git a/trunk/arch/x86/kernel/cpu/amd.c b/trunk/arch/x86/kernel/cpu/amd.c index 8f5cabb3c5b0..b13ed393dfce 100644 --- a/trunk/arch/x86/kernel/cpu/amd.c +++ b/trunk/arch/x86/kernel/cpu/amd.c @@ -612,8 +612,11 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) } #endif - /* As a rule processors have APIC timer running in deep C states */ - if (c->x86 > 0xf && !cpu_has_amd_erratum(amd_erratum_400)) + /* + * Family 0x12 and above processors have APIC timer + * running in deep C states. + */ + if (c->x86 > 0x11) set_cpu_cap(c, X86_FEATURE_ARAT); /*