| commit | efc5ea1c2eaf74cc3ec12a8651705da575fb0e8e | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@quicinc.com> | Mon Jul 31 04:13:18 2017 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Mon Jul 31 04:13:17 2017 -0700 |
| tree | d9963306572a6183084414692de3cbaa07481cfc | |
| parent | 588b9247d9dd9fd4799e1587e6364abb8eae2796 [diff] | |
| parent | e65af6b1bf857738e5f24729aecbc0423fe255ef [diff] |
Merge "mm: process reclaim: skip locked vmas"
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 71b62b8..c585e7e 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c
@@ -1617,6 +1617,9 @@ if (vma->vm_file) continue; + if (vma->vm_flags & VM_LOCKED) + continue; + if (!rp.nr_to_reclaim) break;