X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=mm%2Fmlock.c;h=b680dfd7dbf294d9d13b7a05a78ce29558f5d6e4;hb=2546580dcb667f6f2cbfff4e810e060c00875ce5;hp=3dcea72277be8988ce2df2f185eadb2fc8b05d7a;hpb=8407e2ffb76d56c77b8eb8faa44b06b1b987ac3a;p=firefly-linux-kernel-4.4.55.git

diff --git a/mm/mlock.c b/mm/mlock.c
index 3dcea72277be..b680dfd7dbf2 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -23,10 +23,10 @@
 
 int can_do_mlock(void)
 {
-	if (capable(CAP_IPC_LOCK))
-		return 1;
 	if (rlimit(RLIMIT_MEMLOCK) != 0)
 		return 1;
+	if (capable(CAP_IPC_LOCK))
+		return 1;
 	return 0;
 }
 EXPORT_SYMBOL(can_do_mlock);