diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-06-13 07:40:25 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-06-13 07:40:25 -0700 |
| commit | c8e0bf95fc01d6e2ca585fe08010800b6c56e823 (patch) | |
| tree | f901bdcb5b20e93261cf9cf324ebbcf3fd24ce58 /arch/x86/kernel/cpu/amd.c | |
| parent | 9d5ae7cd6cb9ead43336fec1094184d1dc740fbd (diff) | |
| parent | 345f79b3de7f6d651e4dba794af7c7303bdfd649 (diff) | |
| download | talos-op-linux-c8e0bf95fc01d6e2ca585fe08010800b6c56e823.tar.gz talos-op-linux-c8e0bf95fc01d6e2ca585fe08010800b6c56e823.zip | |
Merge branch 'for_3.0/pm-fixes' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes
Diffstat (limited to 'arch/x86/kernel/cpu/amd.c')
| -rw-r--r-- | arch/x86/kernel/cpu/amd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 8f5cabb3c5b0..b13ed393dfce 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/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); /* |
