diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/mempolicy.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 1763418f1ad..3d64b369180 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c | |||
@@ -1552,8 +1552,18 @@ struct mempolicy *get_vma_policy(struct task_struct *task, | |||
1552 | addr); | 1552 | addr); |
1553 | if (vpol) | 1553 | if (vpol) |
1554 | pol = vpol; | 1554 | pol = vpol; |
1555 | } else if (vma->vm_policy) | 1555 | } else if (vma->vm_policy) { |
1556 | pol = vma->vm_policy; | 1556 | pol = vma->vm_policy; |
1557 | |||
1558 | /* | ||
1559 | * shmem_alloc_page() passes MPOL_F_SHARED policy with | ||
1560 | * a pseudo vma whose vma->vm_ops=NULL. Take a reference | ||
1561 | * count on these policies which will be dropped by | ||
1562 | * mpol_cond_put() later | ||
1563 | */ | ||
1564 | if (mpol_needs_cond_ref(pol)) | ||
1565 | mpol_get(pol); | ||
1566 | } | ||
1557 | } | 1567 | } |
1558 | if (!pol) | 1568 | if (!pol) |
1559 | pol = &default_policy; | 1569 | pol = &default_policy; |