Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your

Makefiles.

1 files changed, 1 insertions, 4 deletions

diff --git a/kernel/fork.c b/kernel/fork.c
index bf3e36cfb..f5d3a83df 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -133,11 +133,9 @@ static inline int dup_mmap(struct mm_struct * mm)
 	mm->mmap_avl = NULL;
 	mm->mmap_cache = NULL;
 	mm->map_count = 0;
-	mm->context = 0;
 	mm->cpu_vm_mask = 0;
 	mm->swap_cnt = 0;
 	mm->swap_address = 0;
-	mm->segments = NULL;
 	pprev = &mm->mmap;
 	for (mpnt = current->mm->mmap ; mpnt ; mpnt = mpnt->vm_next) {
 		struct file *file;
@@ -179,10 +177,9 @@ static inline int dup_mmap(struct mm_struct * mm)
 		 * Link in the new vma even if an error occurred,
 		 * so that exit_mmap() can clean up the mess.
 		 */
-		tmp->vm_next = *pprev;
 		*pprev = tmp;
-
 		pprev = &tmp->vm_next;
+
 		if (retval)
 			goto fail_nomem;
 	}