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 branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
x86
/
Kconfig.cpu
diff --git
a/arch/x86/Kconfig.cpu
b/arch/x86/Kconfig.cpu
index
2ac9069
..
15588a0
100644
(file)
--- a/
arch/x86/Kconfig.cpu
+++ b/
arch/x86/Kconfig.cpu
@@
-310,6
+310,9
@@
config X86_INTERNODE_CACHE_SHIFT
config X86_CMPXCHG
def_bool X86_64 || (X86_32 && !M386)
+config CMPXCHG_LOCAL
+ def_bool X86_64 || (X86_32 && !M386)
+
config X86_L1_CACHE_SHIFT
int
default "7" if MPENTIUM4 || MPSC