diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 10:14:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 10:14:56 -0700 |
| commit | 41e0e0738cf864f4f49b11aac804496999b311d9 (patch) | |
| tree | 0616361f85ae1181815c8c6afcaa767c142aac1d /arch/x86/kernel/cpu/amd.c | |
| parent | e7fd3b4669f5b835c8afce28425d9f698a558115 (diff) | |
| parent | 344c21c32287755b5cda0eeb84adb4546a57c1db (diff) | |
| download | kernel_samsung_smdk4412-41e0e0738cf864f4f49b11aac804496999b311d9.zip kernel_samsung_smdk4412-41e0e0738cf864f4f49b11aac804496999b311d9.tar.gz kernel_samsung_smdk4412-41e0e0738cf864f4f49b11aac804496999b311d9.tar.bz2 | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, AMD: Set ARAT feature on AMD processors
x86, quirk: Fix SB600 revision check
x86: stop_machine_text_poke() should issue sync_core()
x86, amd-nb: Misc cleanliness fixes
Diffstat (limited to 'arch/x86/kernel/cpu/amd.c')
| -rw-r--r-- | arch/x86/kernel/cpu/amd.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index f771ab6..3ecece0 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -611,6 +611,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 |