summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-06-01 01:53:21 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-06-01 01:53:21 -0700
commit64b788384bd7c30a24b91e8ca14009adf48eaa83 (patch)
treed7962dbcf465248ee62ea8b9ac4836fea31ae03b
parent419619b95d03361301f57d61e33c7adba273ae41 (diff)
parent7cf864f5515b15e7aba6b48d3799949fb62065eb (diff)
Merge "mm: process reclaim: skip locked vmas"
-rw-r--r--fs/proc/task_mmu.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index fc5243c331c4..420f623e3441 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -1518,6 +1518,9 @@ struct reclaim_param reclaim_task_anon(struct task_struct *task,
if (vma->vm_file)
continue;
+ if (vma->vm_flags & VM_LOCKED)
+ continue;
+
if (!rp.nr_to_reclaim)
break;