diff options
| author | Huang Shijie <shijie8@gmail.com> | 2012-07-30 23:42:30 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-31 02:25:20 +0200 |
| commit | b2412b7fa7a3816fa8633dc2ff19f1a90aabe423 (patch) | |
| tree | 5059c916b993726b3b208859f35c8b59761f2656 /kernel | |
| parent | proc: do not allow negative offsets on /proc/<pid>/environ (diff) | |
| download | linux-b2412b7fa7a3816fa8633dc2ff19f1a90aabe423.tar.xz linux-b2412b7fa7a3816fa8633dc2ff19f1a90aabe423.zip | |
fork: use vma_pages() to simplify the code
The current code can be replaced by vma_pages(). So use it to simplify
the code.
[akpm@linux-foundation.org: initialise `len' at its definition site]
Signed-off-by: Huang Shijie <shijie8@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/fork.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index ff1cad3b7bdc..2c1802948a38 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -391,8 +391,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) } charge = 0; if (mpnt->vm_flags & VM_ACCOUNT) { - unsigned long len; - len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT; + unsigned long len = vma_pages(mpnt); + if (security_vm_enough_memory_mm(oldmm, len)) /* sic */ goto fail_nomem; charge = len; |