diff options
-rw-r--r-- | include/linux/mm.h | 2 | ||||
-rw-r--r-- | mm/mlock.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 1d6ec55d8b25..f1cd22f2df1a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
@@ -1100,7 +1100,7 @@ static inline bool shmem_mapping(struct address_space *mapping) | |||
1100 | } | 1100 | } |
1101 | #endif | 1101 | #endif |
1102 | 1102 | ||
1103 | extern int can_do_mlock(void); | 1103 | extern bool can_do_mlock(void); |
1104 | extern int user_shm_lock(size_t, struct user_struct *); | 1104 | extern int user_shm_lock(size_t, struct user_struct *); |
1105 | extern void user_shm_unlock(size_t, struct user_struct *); | 1105 | extern void user_shm_unlock(size_t, struct user_struct *); |
1106 | 1106 | ||
diff --git a/mm/mlock.c b/mm/mlock.c index 9197b6721a1e..e1e2b1207bf2 100644 --- a/mm/mlock.c +++ b/mm/mlock.c | |||
@@ -24,13 +24,13 @@ | |||
24 | 24 | ||
25 | #include "internal.h" | 25 | #include "internal.h" |
26 | 26 | ||
27 | int can_do_mlock(void) | 27 | bool can_do_mlock(void) |
28 | { | 28 | { |
29 | if (rlimit(RLIMIT_MEMLOCK) != 0) | 29 | if (rlimit(RLIMIT_MEMLOCK) != 0) |
30 | return 1; | 30 | return true; |
31 | if (capable(CAP_IPC_LOCK)) | 31 | if (capable(CAP_IPC_LOCK)) |
32 | return 1; | 32 | return true; |
33 | return 0; | 33 | return false; |
34 | } | 34 | } |
35 | EXPORT_SYMBOL(can_do_mlock); | 35 | EXPORT_SYMBOL(can_do_mlock); |
36 | 36 | ||