From owner-p4-projects@FreeBSD.ORG  Sun Jan 14 13:53:04 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C72D716A415; Sun, 14 Jan 2007 13:53:04 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9F4C216A407
	for <perforce@FreeBSD.org>; Sun, 14 Jan 2007 13:53:04 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 902FC13C46A
	for <perforce@FreeBSD.org>; Sun, 14 Jan 2007 13:53:04 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0EDr4I2085462
	for <perforce@FreeBSD.org>; Sun, 14 Jan 2007 13:53:04 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0EDr4Bn085459
	for perforce@freebsd.org; Sun, 14 Jan 2007 13:53:04 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Sun, 14 Jan 2007 13:53:04 GMT
Message-Id: <200701141353.l0EDr4Bn085459@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rdivacky@FreeBSD.org using -f
From: Roman Divacky <rdivacky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 112893 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Jan 2007 13:53:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=112893

Change 112893 by rdivacky@rdivacky_witten on 2007/01/14 13:52:42

	Make linux_vfork() actually work. This enables make to work again
	with 2.6

Affected files ...

.. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#19 edit
.. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#14 edit

Differences ...

==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#19 (text+ko) ====

@@ -516,6 +516,7 @@
 		return (error);
 	/* wait for the children to exit, ie. emulate vfork */
 	PROC_LOCK(p2);
+	p2->p_flag |= P_PPWAIT;
 	while (p2->p_flag & P_PPWAIT)
 	   	msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0);
 	PROC_UNLOCK(p2);

==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#14 (text+ko) ====

@@ -341,6 +341,7 @@
 		return (error);
 	/* wait for the children to exit, ie. emulate vfork */
 	PROC_LOCK(p2);
+	p2->p_flag |= P_PPWAIT;
 	while (p2->p_flag & P_PPWAIT)
 	   	msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0);
 	PROC_UNLOCK(p2);