diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-05-08 22:05:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-05-08 22:05:59 -0700 |
| commit | 4ee819e6abaa6203dcd727c939e9fec254c5b16e (patch) | |
| tree | 555dce1cdc25f9420304e4f559a3d59555780609 /kernel | |
| parent | bf4d84856aacd032acb9a92daed616aaa5a17ae2 (diff) | |
| parent | 3de8785e34aa94edec93e6171638dc0d033a98bf (diff) | |
Merge master.kernel.org:/home/davem/BK/misc-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
Diffstat (limited to 'kernel')
| -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 9c02ba5c4635..61a6c7799bb3 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -387,6 +387,9 @@ static int copy_mm(unsigned long clone_flags, struct task_struct * tsk) if (!mm_init(mm)) goto fail_nomem; + if (init_new_context(tsk,mm)) + goto free_pt; + down_write(&oldmm->mmap_sem); retval = dup_mmap(mm); up_write(&oldmm->mmap_sem); @@ -394,9 +397,6 @@ static int copy_mm(unsigned long clone_flags, struct task_struct * tsk) if (retval) goto free_pt; - if (init_new_context(tsk,mm)) - goto free_pt; - good_mm: tsk->mm = mm; tsk->active_mm = mm; |