[PATCH] uml: fix "reuse i386 cpu optimizations"

Remove RWSEM_GENERIC_SPINLOCK, it's now defined (only if needed) by the
underlying arch/i386/Kconfig.cpu.  Leave it only for x86_64.  Even there, it's
totally wrong, as they even have the code to support XCHG_ADD.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 5 insertions, 4 deletions

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index ceaf6e4d28..cd06ed7d84 100644
--- a/arch/um/Kconfig
+++ b/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/arch/um/Kconfig.x86_64 b/arch/um/Kconfig.x86_64
index bd35e59419..aae19bc4b0 100644
--- a/arch/um/Kconfig.x86_64
+++ b/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