Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / um / Kconfig.x86_64

diff --git a/arch/um/Kconfig.x86_64 b/arch/um/Kconfig.x86_64
index bd35e59419c8b8ff88aeeb2277a74b875eacc6df..6533b349f06190eb31ea7960ad9e65fbc36475b8 100644 (file)
--- a/arch/um/Kconfig.x86_64
+++ b/arch/um/Kconfig.x86_64
@@ -6,30 +6,19 @@ config 64BIT
        bool
        default y
 
-config SEMAPHORE_SLEEPERS
+#XXX: this is so in the underlying arch, but it's wrong!!!
+config RWSEM_GENERIC_SPINLOCK
        bool
        default y
 
-config TOP_ADDR
-       hex
-       default 0x80000000
+config SEMAPHORE_SLEEPERS
+       bool
+       default y
 
 config 3_LEVEL_PGTABLES
        bool
        default y
 
-config STUB_CODE
-       hex
-       default 0x7fbfffe000
-
-config STUB_DATA
-       hex
-       default 0x7fbffff000
-
-config STUB_START
-       hex
-       default STUB_CODE
-
 config ARCH_HAS_SC_SIGNALS
        bool
        default n
@@ -41,3 +30,10 @@ config ARCH_REUSE_HOST_VSYSCALL_AREA
 config SMP_BROKEN
        bool
        default y
+
+config GENERIC_HWEIGHT
+       bool
+       default y
+
+config ARCH_SUPPORTS_AOUT
+       def_bool y