aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2007-12-01 12:16:28 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-03 08:13:17 -0800
commit54d67ee22c1ed12ff595defdf89e3d07b430497d (patch)
tree899df53a92126f604f4bfede6bf52d2fc7622401
parentI4L: fix isdn_ioctl memory overrun vulnerability (diff)
downloadlinux-dev-54d67ee22c1ed12ff595defdf89e3d07b430497d.tar.xz
linux-dev-54d67ee22c1ed12ff595defdf89e3d07b430497d.zip
uml: keep UML Kconfig in sync with x86
Fix a UML build breakage introduced by commit 1032c0ba9da5c5b53173ad2dcf8b2a2da78f8b17 - it introduces X86_32, with many things which UML needs depending on it. This patch adds definitions of X86_32 and RWSEM_XCHGADD_ALGORITHM to the UML/i386 Kconfig. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
-rw-r--r--arch/um/Kconfig.i3867
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/um/Kconfig.i386 b/arch/um/Kconfig.i386
index e0ac74e5d4c4..717f5d3440e3 100644
--- a/arch/um/Kconfig.i386
+++ b/arch/um/Kconfig.i386
@@ -8,6 +8,13 @@ config UML_X86
bool
default y
+config X86_32
+ bool
+ default y
+
+config RWSEM_XCHGADD_ALGORITHM
+ def_bool y
+
config 64BIT
bool
default n