diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-10-27 18:45:17 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-10-27 18:45:17 -0400 |
| commit | e343eb0d60f74547e0aeb5bd151105c2e6cfe588 (patch) | |
| tree | 92586df0daf3298262a957640e5c86679c963f41 /arch/x86/Kconfig.cpu | |
| parent | ddc04fd4d5163aee9ebdb38a56c365b602e2b7b7 (diff) | |
| parent | 012abeea669ea49636cf952d13298bb68654146a (diff) | |
| download | linux-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.tar.gz linux-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.tar.bz2 linux-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.zip | |
Merge commit 'v2.6.32-rc5' into for-2.6.33
Diffstat (limited to 'arch/x86/Kconfig.cpu')
| -rw-r--r-- | arch/x86/Kconfig.cpu | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index 527519b8a9f9..f2824fb8c79c 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu @@ -400,7 +400,7 @@ config X86_TSC config X86_CMPXCHG64 def_bool y - depends on X86_PAE || X86_64 + depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM # this should be set for all -march=.. options where the compiler # generates cmov. @@ -412,6 +412,7 @@ config X86_MINIMUM_CPU_FAMILY int default "64" if X86_64 default "6" if X86_32 && X86_P6_NOP + default "5" if X86_32 && X86_CMPXCHG64 default "4" if X86_32 && (X86_XADD || X86_CMPXCHG || X86_BSWAP || X86_WP_WORKS_OK) default "3" |