diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-24 10:12:33 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-24 10:12:33 +0200 |
| commit | 93da8b221da95a97316e518c94f03856e5d610a9 (patch) | |
| tree | 23787f3c0d02507f20d804aac23ef209d66a7586 /mm/mempolicy.c | |
| parent | ba63f76e22ee723819c8cec86b31f7ea3182b2ed (diff) | |
| parent | 143c97cc652949893c8056c679012f0aeccb80e5 (diff) | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/mempolicy.c')
| -rw-r--r-- | mm/mempolicy.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index d911fa5cb2a7..618ab125228b 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -861,11 +861,6 @@ static long do_get_mempolicy(int *policy, nodemask_t *nmask, *policy |= (pol->flags & MPOL_MODE_FLAGS); } - if (vma) { - up_read(¤t->mm->mmap_sem); - vma = NULL; - } - err = 0; if (nmask) { if (mpol_store_user_nodemask(pol)) { |