---

yaml --- r: 272165 b: refs/heads/master c: df9d698 h: refs/heads/master i: 272163: 8323fc3 v: v3
git-mirror · Nov 1, 2011 · b4ec693 · b4ec693
1 parent 3a46af9
commit b4ec693
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0c23279c9f800c403f37511484d9014ac83adec
+refs/heads/master: df9d6985be2a7e7683c46e4c6ea608fc69f02b45
diff --git a/trunk/mm/mlock.c b/trunk/mm/mlock.c
@@ -549,7 +549,8 @@ SYSCALL_DEFINE1(mlockall, int, flags)
 	if (!can_do_mlock())
 		goto out;
 
-	lru_add_drain_all();	/* flush pagevec */
+	if (flags & MCL_CURRENT)
+		lru_add_drain_all();	/* flush pagevec */
 
 	down_write(&current->mm->mmap_sem);