diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 09:53:03 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 09:53:03 (GMT) |
| commit | 009b9fc98ddd83f9139fdabb12c0d7a8535d5421 (patch) | |
| tree | f7d3e182407d2ebe50a9b8db6361ac910027a1cf /arch/um/kernel/um_arch.c | |
| parent | 3711ccb07b7f0a13f4f1aa16a8fdca9c930f21ca (diff) | |
| parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) | |
| download | linux-fsl-qoriq-009b9fc98ddd83f9139fdabb12c0d7a8535d5421.tar.xz | |
Merge branch 'linus' into x86/threadinfo
Diffstat (limited to 'arch/um/kernel/um_arch.c')
| -rw-r--r-- | arch/um/kernel/um_arch.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index 56deed6..8d84250 100644 --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c @@ -150,7 +150,7 @@ __uml_setup("root=", uml_root_setup, static int __init no_skas_debug_setup(char *line, int *add) { printf("'debug' is not necessary to gdb UML in skas mode - run \n"); - printf("'gdb linux'"); + printf("'gdb linux'\n"); return 0; } @@ -258,6 +258,7 @@ int __init linux_main(int argc, char **argv) { unsigned long avail, diff; unsigned long virtmem_size, max_physmem; + unsigned long stack; unsigned int i; int add; char * mode; @@ -273,7 +274,7 @@ int __init linux_main(int argc, char **argv) if (have_root == 0) add_arg(DEFAULT_COMMAND_LINE); - host_task_size = os_get_task_size(); + host_task_size = os_get_top_address(); /* * TASK_SIZE needs to be PGDIR_SIZE aligned or else exit_mmap craps * out @@ -348,7 +349,9 @@ int __init linux_main(int argc, char **argv) } virtmem_size = physmem_size; - avail = TASK_SIZE - start_vm; + stack = (unsigned long) argv; + stack &= ~(1024 * 1024 - 1); + avail = stack - start_vm; if (physmem_size > avail) virtmem_size = avail; end_vm = start_vm + virtmem_size; |