Pull bugzilla-5452 into release branch

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

diff --git a/arch/um/Kconfig.i386 b/arch/um/Kconfig.i386
index 5d92cac..f6eb72d 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
@@ -10,26 +16,45 @@ config SEMAPHORE_SLEEPERS
        bool
        default y
 
+config HOST_2G_2G
+       bool "2G/2G host address space split"
+       default n
+       help
+       This is needed when the host on which you run has a 2G/2G memory
+       split, instead of the customary 3G/1G.
+
+       Note that to enable such a host
+       configuration, which makes sense only in some cases, you need special
+       host patches.
+
+       So, if you do not know what to do here, say 'N'.
+
 config TOP_ADDR
        hex
        default 0xc0000000 if !HOST_2G_2G
        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
+       default 0xbfffe000 if !HOST_2G_2G
+       default 0x7fffe000 if HOST_2G_2G
 
 config STUB_DATA
        hex
-       default 0xbffff000
+       default 0xbffff000 if !HOST_2G_2G
+       default 0x7ffff000 if HOST_2G_2G
 
 config STUB_START
        hex
@@ -43,6 +68,7 @@ config ARCH_REUSE_HOST_VSYSCALL_AREA
        bool
        default y
 
-config X86_CMPXCHG
+config GENERIC_HWEIGHT
        bool
        default y
+