From b4ec69321666d1be2e9b9455f234da633e04750d Mon Sep 17 00:00:00 2001
From: Christoph Lameter <cl@gentwo.org>
Date: Mon, 31 Oct 2011 17:09:35 -0700
Subject: [PATCH] --- yaml --- r: 272165 b: refs/heads/master c:
 df9d6985be2a7e7683c46e4c6ea608fc69f02b45 h: refs/heads/master i:   272163:
 8323fc3e938268b8f5024633f0d09f5d2ec0be72 v: v3

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

diff --git a/[refs] b/[refs]
index 38ca5f6d9070..5b0728ede8df 100644
--- 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
index 048260c4e02e..7debb4fdf79b 100644
--- 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);