From 435fd921d45a6efff6512aa22137f10b75226ebc Mon Sep 17 00:00:00 2001
From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Date: Fri, 5 Mar 2010 13:41:43 -0800
Subject: [PATCH] --- yaml --- r: 186192 b: refs/heads/master c:
 06f9d8c2b50060543fb6e0af87ddb86e654dee6b h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/mm/mmap.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 537eb5896936..bf5835a661f6 100644
--- 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
index 7acd7b0ad176..c646618702cf 100644
--- 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;