diff options
| author | Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com> | 2011-09-15 01:21:08 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-15 03:09:37 +0200 |
| commit | e5f0bdc7840bdb791247cb98dfc1dab6ea6c7da4 (patch) | |
| tree | e818977d221bdb93b8bb6098310f25e99877736a /arch/um | |
| parent | numa: fix NUMA compile error when sysfs and procfs are disabled (diff) | |
| download | linux-e5f0bdc7840bdb791247cb98dfc1dab6ea6c7da4.tar.xz linux-e5f0bdc7840bdb791247cb98dfc1dab6ea6c7da4.zip | |
um: disable CMPXCHG_DOUBLE as it breaks UML build
Commit b789ef518b2 ("slub: Add cmpxchg_double_slab()") tests for
cmpxchg_double support in the SLUB code and it breaks UML builds with
SLUB. Since UML does not support checking for CPU features, disable
CMPXCHG_DOUBLE just like CMPXCHG_LOCAL is disabled for UML.
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Reviewed-by: Christoph Lameter <cl@linux.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Richard Weinberger <richard@nod.at>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/Kconfig.x86 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/um/Kconfig.x86 b/arch/um/Kconfig.x86 index d31ecf346b4e..21bebe63df66 100644 --- a/arch/um/Kconfig.x86 +++ b/arch/um/Kconfig.x86 @@ -10,6 +10,10 @@ config CMPXCHG_LOCAL bool default n +config CMPXCHG_DOUBLE + bool + default n + source "arch/x86/Kconfig.cpu" endmenu |