From 0f97d634e17961811593c1633ca2f9d0a248b166 Mon Sep 17 00:00:00 2001
From: Boris Ostrovsky <boris.ostrovsky@amd.com>
Date: Tue, 15 Mar 2011 12:13:44 -0400
Subject: [PATCH] --- yaml --- r: 235169 b: refs/heads/master c:
 b87cf80af3ba4b4c008b4face3c68d604e1715c6 h: refs/heads/master i:   235167:
 657735c2d310ed1cba63ee694e40343a8296c2c7 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/cpu/amd.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1570a29e55b2..7f411735f54c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d3e09a304e6c4e004ca06356578b171e8735d3c
+refs/heads/master: b87cf80af3ba4b4c008b4face3c68d604e1715c6
diff --git a/trunk/arch/x86/kernel/cpu/amd.c b/trunk/arch/x86/kernel/cpu/amd.c
index 7c7bedb83c5a..48eaa1b6fc46 100644
--- a/trunk/arch/x86/kernel/cpu/amd.c
+++ b/trunk/arch/x86/kernel/cpu/amd.c
@@ -594,6 +594,10 @@ 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))
+		set_cpu_cap(c, X86_FEATURE_ARAT);
 }
 
 #ifdef CONFIG_X86_32