Merge branch 'master'

1 files changed, 24 insertions, 22 deletions

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index cd06ed7d842d..3b5f47c46907 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -65,6 +65,30 @@ config STATIC_LINK
         chroot, and you disable CONFIG_MODE_TT, you probably want to say Y
         here.
 
+config HOST_2G_2G
+        bool "2G/2G host address space split"
+        default n
+        depends on MODE_TT
+        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 KERNEL_HALF_GIGS
+        int "Kernel address space size (in .5G units)"
+        default "1"
+        depends on MODE_TT
+        help
+        This determines the amount of address space that UML will allocate for
+        its own, measured in half Gigabyte units.  The default is 1.
+        Change this only if you need to boot UML with an unusually large amount
+        of physical memory.
+
 config MODE_SKAS
         bool "Separate Kernel Address Space support"
         default y
@@ -182,19 +206,6 @@ config MAGIC_SYSRQ
         The keys are documented in <file:Documentation/sysrq.txt>. Don't say Y
         unless you really know what this hack does.
 
-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 SMP
         bool "Symmetric multi-processing support (EXPERIMENTAL)"
         default n
@@ -241,15 +252,6 @@ config NEST_LEVEL
         set to the host's CONFIG_NEST_LEVEL + CONFIG_KERNEL_HALF_GIGS.
         Only change this if you are running nested UMLs.
 
-config KERNEL_HALF_GIGS
-        int "Kernel address space size (in .5G units)"
-        default "1"
-        help
-        This determines the amount of address space that UML will allocate for
-        its own, measured in half Gigabyte units.  The default is 1.
-        Change this only if you need to boot UML with an unusually large amount
-        of physical memory.
-
 config HIGHMEM
         bool "Highmem support"
         depends on !64BIT