diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-06-24 10:11:27 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-06-24 10:11:27 +0200 |
| commit | 25bc694a8a086bfee6e5b9dd9e53f4de721b0acf (patch) | |
| tree | a843d17b336c9ea7d4cad67843ebbf255d61ea1f /mm/mlock.c | |
| parent | 3e26c5feed2add218046ecf91bab3cfa9bf762a6 (diff) | |
| parent | 000dd5316e1c756a1c028f22e01d06a38249dd4d (diff) | |
| download | linux-25bc694a8a086bfee6e5b9dd9e53f4de721b0acf.tar.bz2 | |
Merge back PCI power management material for v5.3.
Diffstat (limited to 'mm/mlock.c')
| -rw-r--r-- | mm/mlock.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mm/mlock.c b/mm/mlock.c index 080f3b36415b..a90099da4fb4 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -636,11 +636,11 @@ static int apply_vma_lock_flags(unsigned long start, size_t len, * is also counted. * Return value: previously mlocked page counts */ -static int count_mm_mlocked_page_nr(struct mm_struct *mm, +static unsigned long count_mm_mlocked_page_nr(struct mm_struct *mm, unsigned long start, size_t len) { struct vm_area_struct *vma; - int count = 0; + unsigned long count = 0; if (mm == NULL) mm = current->mm; @@ -797,7 +797,8 @@ SYSCALL_DEFINE1(mlockall, int, flags) unsigned long lock_limit; int ret; - if (!flags || (flags & ~(MCL_CURRENT | MCL_FUTURE | MCL_ONFAULT))) + if (!flags || (flags & ~(MCL_CURRENT | MCL_FUTURE | MCL_ONFAULT)) || + flags == MCL_ONFAULT) return -EINVAL; if (!can_do_mlock()) |