Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[sfrench/cifs-2.6.git] / arch / um / Kconfig.i386

diff --git a/arch/um/Kconfig.i386 b/arch/um/Kconfig.i386
index 5d92cacd56c6a71cddf0c88026d7788fedbd3e39..85e6a55b3b59d6741c069378d31091c7de02ec55 100644 (file)
--- a/arch/um/Kconfig.i386
+++ b/arch/um/Kconfig.i386
@@ -1,3 +1,9 @@
+menu "Host processor type and features"
+
+source "arch/i386/Kconfig.cpu"
+
+endmenu
+
 config UML_X86
        bool
        default y
@@ -16,13 +22,17 @@ config TOP_ADDR
        default 0x80000000 if HOST_2G_2G
 
 config 3_LEVEL_PGTABLES
-       bool "Three-level pagetables"
+       bool "Three-level pagetables (EXPERIMENTAL)"
        default n
+       depends on EXPERIMENTAL
        help
        Three-level pagetables will let UML have more than 4G of physical
        memory.  All the memory that can't be mapped directly will be treated
        as high memory.
 
+       However, this it experimental on 32-bit architectures, so if unsure say
+       N (on x86-64 it's automatically enabled, instead, as it's safe there).
+
 config STUB_CODE
        hex
        default 0xbfffe000
@@ -43,6 +53,7 @@ config ARCH_REUSE_HOST_VSYSCALL_AREA
        bool
        default y
 
-config X86_CMPXCHG
+config GENERIC_HWEIGHT
        bool
        default y
+