[PATCH] remove the "half of memory" limit on mlock() and

It seems pretty pointless and people do complain about it occasionally.

1 files changed, 4 insertions, 19 deletions

diff --git a/mm/mlock.c b/mm/mlock.c
index 55f066f46f6b..21c8fbfa53a5 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -111,16 +111,8 @@ asmlinkage long sys_mlock(unsigned long start, size_t len)
 	lock_limit >>= PAGE_SHIFT;
 
 	/* check against resource limits */
-	if (locked > lock_limit)
-		goto out;
-
-	/* we may lock at most half of physical memory... */
-	/* (this check is pretty bogus, but doesn't hurt) */
-	if (locked > num_physpages/2)
-		goto out;
-
-	error = do_mlock(start, len, 1);
-out:
+	if (locked <= lock_limit)
+		error = do_mlock(start, len, 1);
 	up_write(&current->mm->mmap_sem);
 	return error;
 }
@@ -178,15 +170,8 @@ asmlinkage long sys_mlockall(int flags)
 	lock_limit >>= PAGE_SHIFT;
 
 	ret = -ENOMEM;
-	if (current->mm->total_vm > lock_limit)
-		goto out;
-
-	/* we may lock at most half of physical memory... */
-	/* (this check is pretty bogus, but doesn't hurt) */
-	if (current->mm->total_vm > num_physpages/2)
-		goto out;
-
-	ret = do_mlockall(flags);
+	if (current->mm->total_vm <= lock_limit)
+		ret = do_mlockall(flags);
 out:
 	up_write(&current->mm->mmap_sem);
 	return ret;