diff options
author | Jeff Dike <jdike@addtoit.com> | 2008-02-08 07:22:07 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 12:22:42 -0500 |
commit | 536788fe2d28e11db6aeda74207d95d750fb761f (patch) | |
tree | 73df2d3a46c542c71d3a84c20c8fd1ce617386a3 /arch/um/defconfig | |
parent | 2f569afd9ced9ebec9a6eb3dbf6f83429be0a7b4 (diff) |
uml: runtime host VMSPLIT detection
Calculate TASK_SIZE at run-time by figuring out the host's VMSPLIT - this is
needed on i386 if UML is to run on hosts with varying VMSPLITs without
recompilation.
TASK_SIZE is now defined in terms of a variable, task_size. This gets rid of
an include of pgtable.h from processor.h, which can cause include loops.
On i386, task_size is calculated early in boot by probing the address space in
a binary search to figure out where the boundary between usable and non-usable
memory is. This tries to make sure that a page that is considered to be in
userspace is, or can be made, read-write. I'm concerned about a system-global
VDSO page in kernel memory being hit and considered to be a userspace page.
On x86_64, task_size is just the old value of CONFIG_TOP_ADDR.
A bunch of config variable are gone now. CONFIG_TOP_ADDR is directly replaced
by TASK_SIZE. NEST_LEVEL is gone since the relocation of the stubs makes it
irrelevant. All the HOST_VMSPLIT stuff is gone. All references to these in
arch/um/Makefile are also gone.
I noticed and fixed a missing extern in os.h when adding os_get_task_size.
Note: This has been revised to fix the 32-bit UML on 64-bit host bug that
Miklos ran into.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/defconfig')
-rw-r--r-- | arch/um/defconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/um/defconfig b/arch/um/defconfig index 86db2862f222..59215bc264ef 100644 --- a/arch/um/defconfig +++ b/arch/um/defconfig | |||
@@ -56,8 +56,6 @@ CONFIG_X86_TSC=y | |||
56 | CONFIG_UML_X86=y | 56 | CONFIG_UML_X86=y |
57 | # CONFIG_64BIT is not set | 57 | # CONFIG_64BIT is not set |
58 | CONFIG_SEMAPHORE_SLEEPERS=y | 58 | CONFIG_SEMAPHORE_SLEEPERS=y |
59 | # CONFIG_HOST_2G_2G is not set | ||
60 | CONFIG_TOP_ADDR=0xc0000000 | ||
61 | # CONFIG_3_LEVEL_PGTABLES is not set | 59 | # CONFIG_3_LEVEL_PGTABLES is not set |
62 | CONFIG_ARCH_HAS_SC_SIGNALS=y | 60 | CONFIG_ARCH_HAS_SC_SIGNALS=y |
63 | CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA=y | 61 | CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA=y |
@@ -81,7 +79,6 @@ CONFIG_HOSTFS=y | |||
81 | # CONFIG_HPPFS is not set | 79 | # CONFIG_HPPFS is not set |
82 | CONFIG_MCONSOLE=y | 80 | CONFIG_MCONSOLE=y |
83 | CONFIG_MAGIC_SYSRQ=y | 81 | CONFIG_MAGIC_SYSRQ=y |
84 | CONFIG_NEST_LEVEL=0 | ||
85 | # CONFIG_HIGHMEM is not set | 82 | # CONFIG_HIGHMEM is not set |
86 | CONFIG_KERNEL_STACK_ORDER=0 | 83 | CONFIG_KERNEL_STACK_ORDER=0 |
87 | 84 | ||