diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-16 15:52:47 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-16 15:52:47 +0800 |
| commit | 910c2c512670cde02f5fb7570f622e636257874e (patch) | |
| tree | 8e35947a4c2f7b88e4971f38e8518a00ecd6cf1c /mm | |
| parent | c577a32260e3c74bd2ccf42273c2f5cdf981b9a0 (diff) | |
| parent | 81f8d49e4f2f38480d83ff53b5c426d8d12910e9 (diff) | |
Merge branch 'linaro-android-3.10-lsk' of
git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-android
Diffstat (limited to 'mm')
| -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 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); |