---

yaml --- r: 186192 b: refs/heads/master c: 06f9d8c h: refs/heads/master v: v3
git-mirror · Mar 6, 2010 · 435fd92 · 435fd92
1 parent e60fd89
commit 435fd92
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c58267c32429ea6535428ca6b8a036892c1697f2
+refs/heads/master: 06f9d8c2b50060543fb6e0af87ddb86e654dee6b
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
@@ -1265,8 +1265,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
 	mm->total_vm += len >> PAGE_SHIFT;
 	vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
 	if (vm_flags & VM_LOCKED) {
-		long nr_pages = mlock_vma_pages_range(vma, addr, addr + len);
-		mm->locked_vm += (len >> PAGE_SHIFT) - nr_pages;
+		if (!mlock_vma_pages_range(vma, addr, addr + len))
+			mm->locked_vm += (len >> PAGE_SHIFT);
 	} else if ((flags & MAP_POPULATE) && !(flags & MAP_NONBLOCK))
 		make_pages_present(addr, addr + len);
 	return addr;