diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-07 22:51:47 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-07 22:51:47 -0500 |
| commit | 6b995751c2e851d2bc9c277b5884d0adb519e31d (patch) | |
| tree | 7a15b41b5d8ce612915584a0773c670d5c0ab5b8 /arch/um/kernel/skas/mem.c | |
| parent | 6c2f4267833f453156f8f439cc32eb4c92f357b4 (diff) | |
| parent | d27ba47e7e8c466c18983a1779d611f82d6a354f (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/um/kernel/skas/mem.c')
| -rw-r--r-- | arch/um/kernel/skas/mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/skas/mem.c b/arch/um/kernel/skas/mem.c index 147466d7ff4f..88ab96c609ce 100644 --- a/arch/um/kernel/skas/mem.c +++ b/arch/um/kernel/skas/mem.c | |||
| @@ -20,7 +20,7 @@ unsigned long set_task_sizes_skas(int arg, unsigned long *host_size_out, | |||
| 20 | *task_size_out = CONFIG_HOST_TASK_SIZE; | 20 | *task_size_out = CONFIG_HOST_TASK_SIZE; |
| 21 | #else | 21 | #else |
| 22 | *host_size_out = top; | 22 | *host_size_out = top; |
| 23 | if (proc_mm && ptrace_faultinfo) | 23 | if (!skas_needs_stub) |
| 24 | *task_size_out = top; | 24 | *task_size_out = top; |
| 25 | else *task_size_out = CONFIG_STUB_START & PGDIR_MASK; | 25 | else *task_size_out = CONFIG_STUB_START & PGDIR_MASK; |
| 26 | #endif | 26 | #endif |