projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
clocksource: Improve comment explaining clocks_calc_max_nsecs()'s 50% safety margin
[cascardo/linux.git]
/
mm
/
mlock.c
diff --git
a/mm/mlock.c
b/mm/mlock.c
index
73cf098
..
8a54cd2
100644
(file)
--- a/
mm/mlock.c
+++ b/
mm/mlock.c
@@
-26,10
+26,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);