diff --git a/[refs] b/[refs]
index d639fb97a2ac..66609ca20222 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96d55b882b85b26711a06d8fb2c901df9d52a48b
+refs/heads/master: b365157be3250a6b5948422ba65e05e5f964e150
diff --git a/trunk/arch/um/Kconfig b/trunk/arch/um/Kconfig
index ceaf6e4d2855..cd06ed7d842d 100644
--- a/trunk/arch/um/Kconfig
+++ b/trunk/arch/um/Kconfig
@@ -27,10 +27,6 @@ config UID16
 	bool
 	default y
 
-config RWSEM_GENERIC_SPINLOCK
-	bool
-	default y
-
 config GENERIC_CALIBRATE_DELAY
 	bool
 	default y
diff --git a/trunk/arch/um/Kconfig.x86_64 b/trunk/arch/um/Kconfig.x86_64
index bd35e59419c8..aae19bc4b06a 100644
--- a/trunk/arch/um/Kconfig.x86_64
+++ b/trunk/arch/um/Kconfig.x86_64
@@ -6,6 +6,11 @@ config 64BIT
 	bool
 	default y
 
+#XXX: this is so in the underlying arch, but it's wrong!!!
+config RWSEM_GENERIC_SPINLOCK
+	bool
+	default y
+
 config SEMAPHORE_SLEEPERS
 	bool
 	default y