From 84769c55713ac34950e4acda599a20f7909f60c8 Mon Sep 17 00:00:00 2001
From: Joris van Rantwijk <jvrantwijk@xs4all.nl>
Date: Mon, 1 May 2006 12:15:56 -0700
Subject: [PATCH] --- yaml --- r: 26397 b: refs/heads/master c:
 893bb96a29bee4a5cf2486720ac79412aaee5066 h: refs/heads/master i:   26395:
 c932945e525708bd2e431647e0ba29aa7b89ddae v: v3

---
 [refs]                     |  2 +-
 trunk/arch/um/Kconfig      | 14 --------------
 trunk/arch/um/Kconfig.i386 | 19 +++++++++++++++++--
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 345c1a6b71dd..d8d13c51ed33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c39e50b4bada27102306d7fa68ea35dc4e61bd68
+refs/heads/master: 893bb96a29bee4a5cf2486720ac79412aaee5066
diff --git a/trunk/arch/um/Kconfig b/trunk/arch/um/Kconfig
index 05fbb20636cb..76e85bbaea55 100644
--- a/trunk/arch/um/Kconfig
+++ b/trunk/arch/um/Kconfig
@@ -57,20 +57,6 @@ 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"
diff --git a/trunk/arch/um/Kconfig.i386 b/trunk/arch/um/Kconfig.i386
index 85e6a55b3b59..f6eb72d117b9 100644
--- a/trunk/arch/um/Kconfig.i386
+++ b/trunk/arch/um/Kconfig.i386
@@ -16,6 +16,19 @@ 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
@@ -35,11 +48,13 @@ config 3_LEVEL_PGTABLES
 
 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