Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 308834
b: refs/heads/master
c: 7edc8b0
h: refs/heads/master
v: v3
  • Loading branch information
Siddhesh Poyarekar authored and Linus Torvalds committed May 29, 2012
1 parent 135700a commit 520feed
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 841e31e5cc6219d62054788faa289b6ed682d068
refs/heads/master: 7edc8b0ac16cbaed7cb4ea4c6b95ce98d2997e84
3 changes: 2 additions & 1 deletion trunk/kernel/fork.c
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
}
charge = 0;
if (mpnt->vm_flags & VM_ACCOUNT) {
unsigned int len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
unsigned long len;
len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
goto fail_nomem;
charge = len;
Expand Down

0 comments on commit 520feed

Please sign in to comment.