From owner-p4-projects@FreeBSD.ORG  Thu Jan 18 10:17:15 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 2944B16A415; Thu, 18 Jan 2007 10:17:15 +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 CA1C216A47E
	for <perforce@FreeBSD.org>; Thu, 18 Jan 2007 10:17:14 +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 BAEE613C467
	for <perforce@FreeBSD.org>; Thu, 18 Jan 2007 10:17:14 +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 l0IAHEpc033248
	for <perforce@FreeBSD.org>; Thu, 18 Jan 2007 10:17:14 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0IAHE0a033245
	for perforce@freebsd.org; Thu, 18 Jan 2007 10:17:14 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Thu, 18 Jan 2007 10:17:14 GMT
Message-Id: <200701181017.l0IAHE0a033245@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 113103 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: Thu, 18 Jan 2007 10:17:15 -0000

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

Change 113103 by rdivacky@rdivacky_witten on 2007/01/18 10:17:04

	We have to lock the em in a case of child == 0 because its looked up
	thus shared.

Affected files ...

.. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#23 edit

Differences ...

==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#23 (text+ko) ====

@@ -99,7 +99,7 @@
 		}
 	} else {
 		/* lookup the old one */
-		em = em_find(td->td_proc, EMUL_DONTLOCK);
+		em = em_find(td->td_proc, EMUL_DOLOCK);
 		KASSERT(em != NULL, ("proc_init: emuldata not found in exec case.\n"));
 	}
 
@@ -139,7 +139,8 @@
 		/* we might have a sleeping linux_schedtail */
 		wakeup(&p->p_emuldata);
 		PROC_UNLOCK(p);
-	}
+	} else
+	   	EMUL_UNLOCK(&emul_lock);
 
 	return (0);
 }