From owner-p4-projects@FreeBSD.ORG  Sat Jan 20 10:13:50 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 E68BB16A405; Sat, 20 Jan 2007 10:13:49 +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 B4A5B16A402
	for <perforce@FreeBSD.org>; Sat, 20 Jan 2007 10:13:49 +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 A513913C45E
	for <perforce@FreeBSD.org>; Sat, 20 Jan 2007 10:13:49 +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 l0KADnoQ071835
	for <perforce@FreeBSD.org>; Sat, 20 Jan 2007 10:13:49 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0KADnfa071828
	for perforce@freebsd.org; Sat, 20 Jan 2007 10:13:49 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Sat, 20 Jan 2007 10:13:49 GMT
Message-Id: <200701201013.l0KADnfa071828@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 113204 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: Sat, 20 Jan 2007 10:13:50 -0000

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

Change 113204 by rdivacky@rdivacky_witten on 2007/01/20 10:13:11

	No need to synchronize linux_schedtail with linux_proc_init. We know
	that p->p_emuldata is properly initialized in the time when the children
	can run.

Affected files ...

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

Differences ...

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

@@ -136,8 +136,6 @@
 		p = pfind(child);
 		KASSERT(p != NULL, ("process not found in proc_init\n"));
 		p->p_emuldata = em;
-		/* we might have a sleeping linux_schedtail */
-		wakeup(&p->p_emuldata);
 		PROC_UNLOCK(p);
 	} else
 		EMUL_UNLOCK(&emul_lock);
@@ -277,22 +275,10 @@
 	if (__predict_true(p->p_sysent != &elf_linux_sysvec))
 		return;
 
-retry:
 	/* find the emuldata */
 	em = em_find(p, EMUL_DOLOCK);
 
-	if (em == NULL) {
-		/*
-		 * We might have been called before proc_init for this
-		 * process so tsleep and be woken up by it. We use
-		 * p->p_emuldata for this
-		 */
-
-		error = tsleep(&p->p_emuldata, PLOCK, "linux_schedtail", hz);
-		if (error == 0)
-			goto retry;
-		panic("no emuldata found for userreting process.\n");
-	}
+	KASSERT(em != NULL, ("linux_schedtail: emuldata not found.\n"));
 	child_set_tid = em->child_set_tid;
 	EMUL_UNLOCK(&emul_lock);