diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-26 17:50:42 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-26 17:50:42 -0700 |
| commit | 1be38e041f8eaa935f370aa0f34dd7a2fe39b1d8 (patch) | |
| tree | 2d89734fc831593784bd411be03a1b9649de4c9d /mm/mlock.c | |
| parent | 6935224da2482a261c786501fbccb1dc4a675225 (diff) | |
| parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
Merge tag 'v4.0-rc5' into spi-bcm2835
Linux 4.0-rc5
Diffstat (limited to 'mm/mlock.c')
| -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 @@ 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); |