aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/fork.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/fork.c')
-rw-r--r--kernel/fork.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/fork.c b/kernel/fork.c
index 0cf9cdb6e491..8c162d102740 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -601,9 +601,8 @@ static void check_mm(struct mm_struct *mm)
601 printk(KERN_ALERT "BUG: Bad rss-counter state " 601 printk(KERN_ALERT "BUG: Bad rss-counter state "
602 "mm:%p idx:%d val:%ld\n", mm, i, x); 602 "mm:%p idx:%d val:%ld\n", mm, i, x);
603 } 603 }
604
605#if defined(CONFIG_TRANSPARENT_HUGEPAGE) && !USE_SPLIT_PMD_PTLOCKS 604#if defined(CONFIG_TRANSPARENT_HUGEPAGE) && !USE_SPLIT_PMD_PTLOCKS
606 VM_BUG_ON(mm->pmd_huge_pte); 605 VM_BUG_ON_MM(mm->pmd_huge_pte, mm);
607#endif 606#endif
608} 607}
609 608
@@ -1360,7 +1359,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
1360 goto bad_fork_cleanup_policy; 1359 goto bad_fork_cleanup_policy;
1361 retval = audit_alloc(p); 1360 retval = audit_alloc(p);
1362 if (retval) 1361 if (retval)
1363 goto bad_fork_cleanup_policy; 1362 goto bad_fork_cleanup_perf;
1364 /* copy all the process information */ 1363 /* copy all the process information */
1365 shm_init_task(p); 1364 shm_init_task(p);
1366 retval = copy_semundo(clone_flags, p); 1365 retval = copy_semundo(clone_flags, p);
@@ -1566,8 +1565,9 @@ bad_fork_cleanup_semundo:
1566 exit_sem(p); 1565 exit_sem(p);
1567bad_fork_cleanup_audit: 1566bad_fork_cleanup_audit:
1568 audit_free(p); 1567 audit_free(p);
1569bad_fork_cleanup_policy: 1568bad_fork_cleanup_perf:
1570 perf_event_free_task(p); 1569 perf_event_free_task(p);
1570bad_fork_cleanup_policy:
1571#ifdef CONFIG_NUMA 1571#ifdef CONFIG_NUMA
1572 mpol_put(p->mempolicy); 1572 mpol_put(p->mempolicy);
1573bad_fork_cleanup_threadgroup_lock: 1573bad_fork_cleanup_threadgroup_lock: