patch-2.2.0-pre7 linux/kernel/fork.c

• Lines: 43
• Date: Sun Jan 10 13:23:35 1999
• Orig file: v2.2.0-pre6/linux/kernel/fork.c
• Orig date: Fri Jan 8 22:36:25 1999

diff -u --recursive --new-file v2.2.0-pre6/linux/kernel/fork.c linux/kernel/fork.c
@@ -284,7 +284,10 @@
 void mmput(struct mm_struct *mm)
 {
 	/* notify parent sleeping on vfork() */
-	wake_up(&current->p_opptr->vfork_sleep);
+	if (current->flags & PF_VFORK) {
+		current->flags &= ~PF_VFORK;
+		up(current->p_opptr->vfork_sem);
+	}
 
 	if (atomic_dec_and_test(&mm->count)) {
 		release_segments(mm);
@@ -456,10 +459,12 @@
 {
 	unsigned long new_flags = p->flags;
 
-	new_flags &= ~(PF_SUPERPRIV | PF_USEDFPU);
+	new_flags &= ~(PF_SUPERPRIV | PF_USEDFPU | PF_VFORK);
 	new_flags |= PF_FORKNOEXEC;
 	if (!(clone_flags & CLONE_PTRACE))
 		new_flags &= ~(PF_PTRACED|PF_TRACESYS);
+	if (clone_flags & CLONE_VFORK)
+		new_flags |= PF_VFORK;
 	p->flags = new_flags;
 }
 
@@ -524,7 +529,7 @@
 	p->p_pptr = p->p_opptr = current;
 	p->p_cptr = NULL;
 	init_waitqueue(&p->wait_chldexit);
-	init_waitqueue(&p->vfork_sleep);
+	p->vfork_sem = NULL;
 
 	p->sigpending = 0;
 	sigemptyset(&p->signal);
@@ -571,7 +576,6 @@
 
 	/* ok, now we should be set up.. */
 	p->swappable = 1;
-	p->trashing_memory = 0;
 	p->exit_signal = clone_flags & CSIGNAL;
 	p->pdeath_signal = 0;