---

yaml --- r: 252695 b: refs/heads/master c: e9cdd34 h: refs/heads/master i: 252693: 72cc2f8 252691: a94a7b1 252687: 4f6cc4f v: v3
git-mirror · May 26, 2011 · 4369807 · 4369807
1 parent c5f29d7
commit 4369807
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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);
 
 	/*