---

yaml --- r: 349701 b: refs/heads/master c: 9977f0f h: refs/heads/master i: 349699: 32f5c75 v: v3
git-mirror · Feb 12, 2013 · 2b1a4ae · 2b1a4ae
1 parent 4e51264
commit 2b1a4ae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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;