rk3368 lcdc: update deflick config for interlace mode ouput

[firefly-linux-kernel-4.4.55.git] / mm / mlock.c

diff --git a/mm/mlock.c b/mm/mlock.c
index 3dcea72277be8988ce2df2f185eadb2fc8b05d7a..b680dfd7dbf294d9d13b7a05a78ce29558f5d6e4 100644 (file)
--- 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);