diff options
Diffstat (limited to 'kernel/fork.c')
-rw-r--r-- | kernel/fork.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index c674aa8d3c31..6067e429f281 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -279,7 +279,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) | |||
279 | if (!tmp) | 279 | if (!tmp) |
280 | goto fail_nomem; | 280 | goto fail_nomem; |
281 | *tmp = *mpnt; | 281 | *tmp = *mpnt; |
282 | pol = mpol_copy(vma_policy(mpnt)); | 282 | pol = mpol_dup(vma_policy(mpnt)); |
283 | retval = PTR_ERR(pol); | 283 | retval = PTR_ERR(pol); |
284 | if (IS_ERR(pol)) | 284 | if (IS_ERR(pol)) |
285 | goto fail_nomem_policy; | 285 | goto fail_nomem_policy; |
@@ -1116,7 +1116,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, | |||
1116 | p->audit_context = NULL; | 1116 | p->audit_context = NULL; |
1117 | cgroup_fork(p); | 1117 | cgroup_fork(p); |
1118 | #ifdef CONFIG_NUMA | 1118 | #ifdef CONFIG_NUMA |
1119 | p->mempolicy = mpol_copy(p->mempolicy); | 1119 | p->mempolicy = mpol_dup(p->mempolicy); |
1120 | if (IS_ERR(p->mempolicy)) { | 1120 | if (IS_ERR(p->mempolicy)) { |
1121 | retval = PTR_ERR(p->mempolicy); | 1121 | retval = PTR_ERR(p->mempolicy); |
1122 | p->mempolicy = NULL; | 1122 | p->mempolicy = NULL; |
@@ -1374,7 +1374,7 @@ bad_fork_cleanup_security: | |||
1374 | security_task_free(p); | 1374 | security_task_free(p); |
1375 | bad_fork_cleanup_policy: | 1375 | bad_fork_cleanup_policy: |
1376 | #ifdef CONFIG_NUMA | 1376 | #ifdef CONFIG_NUMA |
1377 | mpol_free(p->mempolicy); | 1377 | mpol_put(p->mempolicy); |
1378 | bad_fork_cleanup_cgroup: | 1378 | bad_fork_cleanup_cgroup: |
1379 | #endif | 1379 | #endif |
1380 | cgroup_exit(p, cgroup_callbacks_done); | 1380 | cgroup_exit(p, cgroup_callbacks_done); |