aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/fork.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/kernel/fork.c b/kernel/fork.c
index 4bc0bd8ef176..72e3252c6763 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1146,11 +1146,6 @@ static task_t *copy_process(unsigned long clone_flags,
1146 total_forks++; 1146 total_forks++;
1147 write_unlock_irq(&tasklist_lock); 1147 write_unlock_irq(&tasklist_lock);
1148 proc_fork_connector(p); 1148 proc_fork_connector(p);
1149 retval = 0;
1150
1151fork_out:
1152 if (retval)
1153 return ERR_PTR(retval);
1154 return p; 1149 return p;
1155 1150
1156bad_fork_cleanup_namespace: 1151bad_fork_cleanup_namespace:
@@ -1191,7 +1186,8 @@ bad_fork_cleanup_count:
1191 free_uid(p->user); 1186 free_uid(p->user);
1192bad_fork_free: 1187bad_fork_free:
1193 free_task(p); 1188 free_task(p);
1194 goto fork_out; 1189fork_out:
1190 return ERR_PTR(retval);
1195} 1191}
1196 1192
1197struct pt_regs * __devinit __attribute__((weak)) idle_regs(struct pt_regs *regs) 1193struct pt_regs * __devinit __attribute__((weak)) idle_regs(struct pt_regs *regs)