From owner-p4-projects@FreeBSD.ORG  Tue Aug 15 15:23:08 2006
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 949B716A4DF; Tue, 15 Aug 2006 15:23:08 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6F42616A4DA
	for <perforce@FreeBSD.org>; Tue, 15 Aug 2006 15:23:08 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3B6AD43D53
	for <perforce@FreeBSD.org>; Tue, 15 Aug 2006 15:23:08 +0000 (GMT)
	(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 k7FFN8MK002739
	for <perforce@FreeBSD.org>; Tue, 15 Aug 2006 15:23:08 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FFN7rN002736
	for perforce@freebsd.org; Tue, 15 Aug 2006 15:23:07 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Tue, 15 Aug 2006 15:23:07 GMT
Message-Id: <200608151523.k7FFN7rN002736@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 104043 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: Tue, 15 Aug 2006 15:23:08 -0000

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

Change 104043 by rdivacky@rdivacky_witten on 2006/08/15 15:22:57

	Grrrr. Do the locking/unlocking correctly this time.

Affected files ...

.. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#27 edit

Differences ...

==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#27 (text+ko) ====

@@ -339,9 +339,13 @@
 			return f;
 		}
 	}
+	if (locked == FUTEX_UNLOCKED)
+	   	FUTEX_UNLOCK;
 
 	/* Not found, create it */
 	f = malloc(sizeof(*f), M_LINUX, M_WAITOK);
+	if (locked == FUTEX_UNLOCKED)
+	   	FUTEX_LOCK;
 	f->f_uaddr = uaddr;
 	f->f_refcount = 1;
 	TAILQ_INIT(&f->f_waiting_proc);