aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/mempolicy.c6
-rw-r--r--mm/mmap.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index ce2c5b6bf9f8..e9fc1c1ae66c 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -1566,15 +1566,15 @@ struct page *alloc_pages_current(gfp_t gfp, unsigned order)
1566EXPORT_SYMBOL(alloc_pages_current); 1566EXPORT_SYMBOL(alloc_pages_current);
1567 1567
1568/* 1568/*
1569 * If mpol_copy() sees current->cpuset == cpuset_being_rebound, then it 1569 * If mpol_dup() sees current->cpuset == cpuset_being_rebound, then it
1570 * rebinds the mempolicy its copying by calling mpol_rebind_policy() 1570 * rebinds the mempolicy its copying by calling mpol_rebind_policy()
1571 * with the mems_allowed returned by cpuset_mems_allowed(). This 1571 * with the mems_allowed returned by cpuset_mems_allowed(). This
1572 * keeps mempolicies cpuset relative after its cpuset moves. See 1572 * keeps mempolicies cpuset relative after its cpuset moves. See
1573 * further kernel/cpuset.c update_nodemask(). 1573 * further kernel/cpuset.c update_nodemask().
1574 */ 1574 */
1575 1575
1576/* Slow path of a mempolicy copy */ 1576/* Slow path of a mempolicy duplicate */
1577struct mempolicy *__mpol_copy(struct mempolicy *old) 1577struct mempolicy *__mpol_dup(struct mempolicy *old)
1578{ 1578{
1579 struct mempolicy *new = kmem_cache_alloc(policy_cache, GFP_KERNEL); 1579 struct mempolicy *new = kmem_cache_alloc(policy_cache, GFP_KERNEL);
1580 1580
diff --git a/mm/mmap.c b/mm/mmap.c
index 36c85e04fa93..677d184b0d42 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1810,7 +1810,7 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
1810 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT); 1810 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
1811 } 1811 }
1812 1812
1813 pol = mpol_copy(vma_policy(vma)); 1813 pol = mpol_dup(vma_policy(vma));
1814 if (IS_ERR(pol)) { 1814 if (IS_ERR(pol)) {
1815 kmem_cache_free(vm_area_cachep, new); 1815 kmem_cache_free(vm_area_cachep, new);
1816 return PTR_ERR(pol); 1816 return PTR_ERR(pol);
@@ -2126,7 +2126,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
2126 new_vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); 2126 new_vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
2127 if (new_vma) { 2127 if (new_vma) {
2128 *new_vma = *vma; 2128 *new_vma = *vma;
2129 pol = mpol_copy(vma_policy(vma)); 2129 pol = mpol_dup(vma_policy(vma));
2130 if (IS_ERR(pol)) { 2130 if (IS_ERR(pol)) {
2131 kmem_cache_free(vm_area_cachep, new_vma); 2131 kmem_cache_free(vm_area_cachep, new_vma);
2132 return NULL; 2132 return NULL;