From 2b1a4ae47bc0dd3c9b1ecf580d788dfeb29fc51e Mon Sep 17 00:00:00 2001
From: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Date: Tue, 12 Feb 2013 13:46:20 -0800
Subject: [PATCH] --- yaml --- r: 349701 b: refs/heads/master c:
 9977f0f164d46613288e0b5778eae500dfe06f31 h: refs/heads/master i:   349699:
 32f5c7595b606e788289d9e4fd1703b8429bbc58 v: v3

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

diff --git a/[refs] b/[refs]
index 52591151c1cf..17d91d5a014e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3399cfb5df9594495b876d1843a7165f77366b2b
+refs/heads/master: 9977f0f164d46613288e0b5778eae500dfe06f31
diff --git a/trunk/mm/mlock.c b/trunk/mm/mlock.c
index f0b9ce572fc7..c9bd528b01d2 100644
--- a/trunk/mm/mlock.c
+++ b/trunk/mm/mlock.c
@@ -517,11 +517,11 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
 static int do_mlockall(int flags)
 {
 	struct vm_area_struct * vma, * prev = NULL;
-	unsigned int def_flags = 0;
 
 	if (flags & MCL_FUTURE)
-		def_flags = VM_LOCKED;
-	current->mm->def_flags = def_flags;
+		current->mm->def_flags |= VM_LOCKED;
+	else
+		current->mm->def_flags &= ~VM_LOCKED;
 	if (flags == MCL_FUTURE)
 		goto out;