Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[pandora-kernel.git] / arch / um / Kconfig.x86_64

diff --git a/arch/um/Kconfig.x86_64 b/arch/um/Kconfig.x86_64
index 6e5357c..f60e9e5 100644 (file)
--- 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
@@ -37,3 +42,12 @@ config ARCH_HAS_SC_SIGNALS
 config ARCH_REUSE_HOST_VSYSCALL_AREA
        bool
        default n
+
+config SMP_BROKEN
+       bool
+       default y
+
+config GENERIC_HWEIGHT
+       bool
+       default y
+