diff options
| -rw-r--r-- | mm/mlock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/mlock.c b/mm/mlock.c index 73cf0987088c..8a54cd214925 100644 --- a/mm/mlock.c +++ b/mm/mlock.c | |||
| @@ -26,10 +26,10 @@ | |||
| 26 | 26 | ||
| 27 | int can_do_mlock(void) | 27 | int can_do_mlock(void) |
| 28 | { | 28 | { |
| 29 | if (capable(CAP_IPC_LOCK)) | ||
| 30 | return 1; | ||
| 31 | if (rlimit(RLIMIT_MEMLOCK) != 0) | 29 | if (rlimit(RLIMIT_MEMLOCK) != 0) |
| 32 | return 1; | 30 | return 1; |
| 31 | if (capable(CAP_IPC_LOCK)) | ||
| 32 | return 1; | ||
| 33 | return 0; | 33 | return 0; |
| 34 | } | 34 | } |
| 35 | EXPORT_SYMBOL(can_do_mlock); | 35 | EXPORT_SYMBOL(can_do_mlock); |
