From 68ef852a93c39ae9fa912f24786f8624a8f084fe Mon Sep 17 00:00:00 2001
From: Huang Shijie <shijie8@gmail.com>
Date: Mon, 21 Sep 2009 17:03:36 -0700
Subject: [PATCH] --- yaml --- r: 164478 b: refs/heads/master c:
 cdf7b3418ad5a8783efe8f9124023d9b869fec0f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 87f4e7a45638..bb9ef84abaed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03f6462a3ae78f36eb1f0ee8b4d5ae2f7859c1d5
+refs/heads/master: cdf7b3418ad5a8783efe8f9124023d9b869fec0f
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
index 6eed98c00543..56eb871c32d0 100644
--- a/trunk/mm/mmap.c
+++ b/trunk/mm/mmap.c
@@ -963,11 +963,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
 	vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
 			mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
 
-	if (flags & MAP_LOCKED) {
+	if (flags & MAP_LOCKED)
 		if (!can_do_mlock())
 			return -EPERM;
-		vm_flags |= VM_LOCKED;
-	}
 
 	/* mlock MCL_FUTURE? */
 	if (vm_flags & VM_LOCKED) {