From c1dbd6e6bb3f7030994e6c7e27c0bb2ccaab5f0a Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Tue, 12 Jul 2005 13:58:09 -0700 Subject: [PATCH] --- yaml --- r: 4663 b: refs/heads/master c: 3b6bfcdb116f2cc2cab921fcac6d39d4022952d2 h: refs/heads/master i: 4661: 66d2afae1313b7432039638041f321ca22d384ba 4659: 4a56e75443e322a839eb993e28a63761af8f7134 4655: c3c127ed13e546b371ae09f2b0922961120f7321 v: v3 --- [refs] | 2 +- trunk/kernel/fork.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 79907b705202..9c952360b294 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70d1d47c47c4643af357cb44d0d891c1b765f2ab +refs/heads/master: 3b6bfcdb116f2cc2cab921fcac6d39d4022952d2 diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c index cdef6cea8900..b65187f0c74e 100644 --- a/trunk/kernel/fork.c +++ b/trunk/kernel/fork.c @@ -208,8 +208,10 @@ static inline int dup_mmap(struct mm_struct * mm, struct mm_struct * oldmm) struct file *file; if (mpnt->vm_flags & VM_DONTCOPY) { + long pages = vma_pages(mpnt); + mm->total_vm -= pages; __vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file, - -vma_pages(mpnt)); + -pages); continue; } charge = 0;