mm: merging memory blocks resets mempolicy

[linux-imx.git] / mm / mmap.c

diff --git a/mm/mmap.c b/mm/mmap.c
index 288958f05f1cb688092f28d0041e22ff8ab999b6..081e6da8e1a46e8149b660ad7056ace8bca1158c 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -829,7 +829,7 @@ again:                      remove_next = 1 + (end > next->vm_end);
                if (next->anon_vma)
                        anon_vma_merge(vma, next);
                mm->map_count--;
-               mpol_put(vma_policy(next));
+               vma_set_policy(vma, vma_policy(next));
                kmem_cache_free(vm_area_cachep, next);
                /*
                 * In mprotect's case 6 (see comments on vma_merge),