svn commit: r233693 - head/sys/kern

David Xu davidxu at FreeBSD.org
Fri Mar 30 09:03:54 UTC 2012


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);
 }


More information about the svn-src-head mailing list