From: Jeff Dike <jdike@addtoit.com>
To: akpm@osdl.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 13/28] UML - Split out arch link address definitions
Date: Mon, 10 Jan 2005 02:35:43 -0500 [thread overview]
Message-ID: <200501100735.j0A7ZhPW005795@ccure.user-mode-linux.org> (raw)
Define addresses at which UML will link and make them settable by the arch.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Index: 2.6.10/arch/um/Kconfig_arch
===================================================================
--- 2.6.10.orig/arch/um/Kconfig_arch 2003-09-15 09:40:47.000000000 -0400
+++ 2.6.10/arch/um/Kconfig_arch 2005-01-09 18:25:36.000000000 -0500
@@ -0,0 +1,16 @@
+config 64_BIT
+ bool
+ default 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"
+ default n
+ 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.
Index: 2.6.10/arch/um/Kconfig_i386
===================================================================
--- 2.6.10.orig/arch/um/Kconfig_i386 2005-01-07 22:58:55.000000000 -0500
+++ 2.6.10/arch/um/Kconfig_i386 2005-01-09 18:25:36.000000000 -0500
@@ -1,6 +1,12 @@
config 64_BIT
bool
default 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"
default n
@@ -8,4 +14,3 @@
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.
-
Index: 2.6.10/arch/um/Makefile-i386
===================================================================
--- 2.6.10.orig/arch/um/Makefile-i386 2005-01-07 22:58:55.000000000 -0500
+++ 2.6.10/arch/um/Makefile-i386 2005-01-09 18:25:36.000000000 -0500
@@ -1,10 +1,6 @@
SUBARCH_CORE := arch/um/sys-i386/
-ifeq ($(CONFIG_HOST_2G_2G), y)
-TOP_ADDR := 0x80000000
-else
-TOP_ADDR := 0xc0000000
-endif
+TOP_ADDR := $(CONFIG_TOP_ADDR)
ifeq ($(CONFIG_MODE_SKAS),y)
ifneq ($(CONFIG_MODE_TT),y)
Index: 2.6.10/arch/um/kernel/skas/mem.c
===================================================================
--- 2.6.10.orig/arch/um/kernel/skas/mem.c 2005-01-07 22:58:51.000000000 -0500
+++ 2.6.10/arch/um/kernel/skas/mem.c 2005-01-09 18:25:36.000000000 -0500
@@ -13,8 +13,13 @@
/* Round up to the nearest 4M */
unsigned long top = ROUND_4M((unsigned long) &arg);
+#ifdef CONFIG_HOST_TASK_SIZE
+ *host_size_out = CONFIG_HOST_TASK_SIZE;
+ *task_size_out = CONFIG_HOST_TASK_SIZE;
+#else
*host_size_out = top;
*task_size_out = top;
+#endif
return(((unsigned long) set_task_sizes_skas) & ~0xffffff);
}
reply other threads:[~2005-01-10 5:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200501100735.j0A7ZhPW005795@ccure.user-mode-linux.org \
--to=jdike@addtoit.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®