diff --git a/[refs] b/[refs]
index 53576fc68df5..2af4caa58a69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eafe1aa37e6ec2d56f14732b5240c4dd09f0613a
+refs/heads/master: 54d67ee22c1ed12ff595defdf89e3d07b430497d
diff --git a/trunk/arch/um/Kconfig.i386 b/trunk/arch/um/Kconfig.i386
index e0ac74e5d4c4..717f5d3440e3 100644
--- a/trunk/arch/um/Kconfig.i386
+++ b/trunk/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