diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:24:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:24:17 -0400 |
| commit | 9583f3d9c00974911daf227cbaa12d6c1caaabad (patch) | |
| tree | f37466204ecbfea37c7d567fd06c9bece0cc663d /fs/binfmt_elf_fdpic.c | |
| parent | 962cf36c5bf6d2840b8d66ee9a606fae2f540bbd (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into core/softirq
Diffstat (limited to 'fs/binfmt_elf_fdpic.c')
| -rw-r--r-- | fs/binfmt_elf_fdpic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c index ddd35d873391..d051a32e6270 100644 --- a/fs/binfmt_elf_fdpic.c +++ b/fs/binfmt_elf_fdpic.c | |||
| @@ -390,7 +390,7 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm, | |||
| 390 | } | 390 | } |
| 391 | 391 | ||
| 392 | /* expand the stack mapping to use up the entire allocation granule */ | 392 | /* expand the stack mapping to use up the entire allocation granule */ |
| 393 | fullsize = ksize((char *) current->mm->start_brk); | 393 | fullsize = kobjsize((char *) current->mm->start_brk); |
| 394 | if (!IS_ERR_VALUE(do_mremap(current->mm->start_brk, stack_size, | 394 | if (!IS_ERR_VALUE(do_mremap(current->mm->start_brk, stack_size, |
| 395 | fullsize, 0, 0))) | 395 | fullsize, 0, 0))) |
| 396 | stack_size = fullsize; | 396 | stack_size = fullsize; |