diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2012-07-30 14:42:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 17:25:20 -0700 |
| commit | 87bec58a52652e2eb2a575692a40f9466c7bd31b (patch) | |
| tree | bd7d6408b61ee2c1ad6df9f0b44277fb08e75034 /kernel | |
| parent | b2412b7fa7a3816fa8633dc2ff19f1a90aabe423 (diff) | |
| download | linux-87bec58a52652e2eb2a575692a40f9466c7bd31b.tar.gz linux-87bec58a52652e2eb2a575692a40f9466c7bd31b.tar.bz2 linux-87bec58a52652e2eb2a575692a40f9466c7bd31b.zip | |
revert "sched: Fix fork() error path to not crash"
To make way for "fork: fix error handling in dup_task()", which fixes the
errors more completely.
Cc: Salman Qazi <sqazi@google.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/fork.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 2c1802948a38..088025bd1925 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -304,17 +304,12 @@ static struct task_struct *dup_task_struct(struct task_struct *orig) } err = arch_dup_task_struct(tsk, orig); - - /* - * We defer looking at err, because we will need this setup - * for the clean up path to work correctly. - */ - tsk->stack = ti; - setup_thread_stack(tsk, orig); - if (err) goto out; + tsk->stack = ti; + + setup_thread_stack(tsk, orig); clear_user_return_notifier(tsk); clear_tsk_need_resched(tsk); stackend = end_of_stack(tsk); |