From owner-svn-src-head@FreeBSD.ORG  Fri Mar 30 09:03:54 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3B8121065676;
	Fri, 30 Mar 2012 09:03:54 +0000 (UTC)
	(envelope-from davidxu@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 262C18FC12;
	Fri, 30 Mar 2012 09:03:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2U93si6033215;
	Fri, 30 Mar 2012 09:03:54 GMT (envelope-from davidxu@svn.freebsd.org)
Received: (from davidxu@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2U93rda033213;
	Fri, 30 Mar 2012 09:03:53 GMT (envelope-from davidxu@svn.freebsd.org)
Message-Id: <201203300903.q2U93rda033213@svn.freebsd.org>
From: David Xu <davidxu@FreeBSD.org>
Date: Fri, 30 Mar 2012 09:03:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233693 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Mar 2012 09:03:54 -0000

Author: davidxu
Date: Fri Mar 30 09:03:53 2012
New Revision: 233693
URL: http://svn.freebsd.org/changeset/base/233693

Log:
  Fix COMPAT_FREEBSD32 build.
  
  Submitted by: Andreas Tobler < andreast at fgznet dot ch >

Modified:
  head/sys/kern/kern_umtx.c

Modified: head/sys/kern/kern_umtx.c
==============================================================================
--- head/sys/kern/kern_umtx.c	Fri Mar 30 08:33:08 2012	(r233692)
+++ head/sys/kern/kern_umtx.c	Fri Mar 30 09:03:53 2012	(r233693)
@@ -957,7 +957,7 @@ do_lock_umtx32(struct thread *td, uint32
 		umtxq_lock(&uq->uq_key);
 		if (old == owner)
 			error = umtxq_sleep(uq, "umtx", timeout == NULL ?
-			    NULL : timo);
+			    NULL : &timo);
 		umtxq_remove(uq);
 		umtxq_unlock(&uq->uq_key);
 		umtx_key_release(&uq->uq_key);
@@ -3372,7 +3372,7 @@ __umtx_op_rw_rdlock_compat32(struct thre
 		    (size_t)uap->uaddr1, &timeout);
 		if (error != 0)
 			return (error);
-		error = do_rw_rdlock2(td, uap->obj, uap->val, &timeout);
+		error = do_rw_rdlock(td, uap->obj, uap->val, &timeout);
 	}
 	return (error);
 }
@@ -3391,7 +3391,7 @@ __umtx_op_rw_wrlock_compat32(struct thre
 		    (size_t)uap->uaddr1, &timeout);
 		if (error != 0)
 			return (error);
-		error = do_rw_wrlock2(td, uap->obj, &timeout);
+		error = do_rw_wrlock(td, uap->obj, &timeout);
 	}
 	return (error);
 }