Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/arch/um/Kconfig.x86_64 b/arch/um/Kconfig.x86_64
index d632e9a..5696e7b 100644 (file)
--- a/arch/um/Kconfig.x86_64
+++ b/arch/um/Kconfig.x86_64
@@ -1,3 +1,10 @@
+
+menu "Host processor type and features"
+
+source "arch/x86/Kconfig.cpu"
+
+endmenu
+
 config UML_X86
        bool
        default y
@@ -11,14 +18,6 @@ config RWSEM_GENERIC_SPINLOCK
        bool
        default y
 
-config SEMAPHORE_SLEEPERS
-       bool
-       default y
-
-config TOP_ADDR
-       hex
-       default 0x7fc0000000
-
 config 3_LEVEL_PGTABLES
        bool
        default y
@@ -39,3 +38,5 @@ config GENERIC_HWEIGHT
        bool
        default y
 
+config ARCH_SUPPORTS_AOUT
+       def_bool y