git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v2.6.26' into x86/core
[pandora-kernel.git]
/
arch
/
x86
/
Kconfig.cpu
diff --git
a/arch/x86/Kconfig.cpu
b/arch/x86/Kconfig.cpu
index
4da3cdb
..
abff1b8
100644
(file)
--- a/
arch/x86/Kconfig.cpu
+++ b/
arch/x86/Kconfig.cpu
@@
-292,6
+292,11
@@
config X86_GENERIC
endif
endif
+config X86_CPU
+ def_bool y
+ select GENERIC_FIND_FIRST_BIT
+ select GENERIC_FIND_NEXT_BIT
+
#
# Define implied options from the CPU selection here
config X86_L1_CACHE_BYTES
#
# Define implied options from the CPU selection here
config X86_L1_CACHE_BYTES
@@
-339,7
+344,7
@@
config X86_F00F_BUG
config X86_WP_WORKS_OK
def_bool y
config X86_WP_WORKS_OK
def_bool y
- depends on
X86_32 &&
!M386
+ depends on !M386
config X86_INVLPG
def_bool y
config X86_INVLPG
def_bool y
@@
-394,11
+399,15
@@
config X86_TSC
def_bool y
depends on ((MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2) && !X86_NUMAQ) || X86_64
def_bool y
depends on ((MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2) && !X86_NUMAQ) || X86_64
+config X86_CMPXCHG64
+ def_bool y
+ depends on X86_PAE || X86_64
+
# this should be set for all -march=.. options where the compiler
# generates cmov.
config X86_CMOV
def_bool y
# this should be set for all -march=.. options where the compiler
# generates cmov.
config X86_CMOV
def_bool y
- depends on (MK7 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7)
+ depends on (MK7 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7
|| X86_64
)
config X86_MINIMUM_CPU_FAMILY
int
config X86_MINIMUM_CPU_FAMILY
int