[uml-devel] [PATCH 2/6] UML - skas0 support for 2G/2G hosts

[Jeff D. <jd...@ad...>]

From: Joris van Rantwijk <jvr...@xs...>

A quick hack to allow skas0 mode to run on 2G/2G hosts.

Signed-off-by: Jeff Dike <jd...@ad...>

Index: linux-2.6.16/arch/um/Kconfig.i386
===================================================================
--- linux-2.6.16.orig/arch/um/Kconfig.i386	2006-04-26 11:30:35.000000000 -0400
+++ linux-2.6.16/arch/um/Kconfig.i386	2006-04-26 11:39:54.000000000 -0400
@@ -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
Index: linux-2.6.16/arch/um/Kconfig
===================================================================
--- linux-2.6.16.orig/arch/um/Kconfig	2006-04-25 12:00:49.000000000 -0400
+++ linux-2.6.16/arch/um/Kconfig	2006-04-26 11:39:40.000000000 -0400
@@ -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"