From owner-p4-projects@FreeBSD.ORG  Fri Aug  4 13:07:29 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 2A2DE16A4E0; Fri,  4 Aug 2006 13:07:29 +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 0255A16A4DA
	for <perforce@FreeBSD.org>; Fri,  4 Aug 2006 13:07:29 +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 BEC8E43D46
	for <perforce@FreeBSD.org>; Fri,  4 Aug 2006 13:07:28 +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 k74D7S2Q087577
	for <perforce@FreeBSD.org>; Fri, 4 Aug 2006 13:07:28 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74D7S01087574
	for perforce@freebsd.org; Fri, 4 Aug 2006 13:07:28 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Fri, 4 Aug 2006 13:07:28 GMT
Message-Id: <200608041307.k74D7S01087574@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 103163 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: Fri, 04 Aug 2006 13:07:29 -0000

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

Change 103163 by rdivacky@rdivacky_witten on 2006/08/04 13:07:11

	Fix the previous commit. set != store. Also change the checking of the refcount
	to be atomic as well.

Affected files ...

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

Differences ...

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

@@ -284,7 +284,7 @@
 	/* Not found, create it */
 	f = malloc(sizeof(*f), M_LINUX, M_WAITOK);
 	f->f_uaddr = uaddr;
-	atomic_set_int(&f->f_refcount, 1);
+	f->f_refcount = 1;
 	TAILQ_INIT(&f->f_waiting_proc);
 	FUTEX_LOCK;
 	LIST_INSERT_HEAD(&futex_list, f, f_list);
@@ -297,8 +297,7 @@
 futex_put(f)
 	struct futex *f;
 {
-	atomic_add_int(&f->f_refcount, -1);
-	if (f->f_refcount == 0) {
+	if (atomic_fetchadd_int(&f->f_refcount, -1) == 1) {
 		FUTEX_LOCK;
 		LIST_REMOVE(f, f_list);
 		FUTEX_UNLOCK;