From owner-svn-src-all@FreeBSD.ORG  Sat Jan  9 06:05:31 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A6864106566C;
	Sat,  9 Jan 2010 06:05:31 +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 95E9F8FC0C;
	Sat,  9 Jan 2010 06:05:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0965Vto013972;
	Sat, 9 Jan 2010 06:05:31 GMT (envelope-from davidxu@svn.freebsd.org)
Received: (from davidxu@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0965Vr8013970;
	Sat, 9 Jan 2010 06:05:31 GMT (envelope-from davidxu@svn.freebsd.org)
Message-Id: <201001090605.o0965Vr8013970@svn.freebsd.org>
From: David Xu <davidxu@FreeBSD.org>
Date: Sat, 9 Jan 2010 06:05:31 +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: r201885 - head/sys/kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Jan 2010 06:05:31 -0000

Author: davidxu
Date: Sat Jan  9 06:05:31 2010
New Revision: 201885
URL: http://svn.freebsd.org/changeset/base/201885

Log:
  Add key type TYPE_SEM.

Modified:
  head/sys/kern/kern_umtx.c

Modified: head/sys/kern/kern_umtx.c
==============================================================================
--- head/sys/kern/kern_umtx.c	Sat Jan  9 05:40:46 2010	(r201884)
+++ head/sys/kern/kern_umtx.c	Sat Jan  9 06:05:31 2010	(r201885)
@@ -59,12 +59,13 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #define TYPE_SIMPLE_WAIT	0
-#define TYPE_CV			1
-#define TYPE_SIMPLE_LOCK	2
-#define TYPE_NORMAL_UMUTEX	3
-#define TYPE_PI_UMUTEX		4
-#define TYPE_PP_UMUTEX		5
-#define TYPE_RWLOCK		6
+#define TYPE_CV			(TYPE_SIMPLE_WAIT+1)
+#define TYPE_SEM		(TYPE_CV+1)
+#define TYPE_SIMPLE_LOCK	(TYPE_SEM+1)
+#define TYPE_NORMAL_UMUTEX	(TYPE_SIMPLE_LOCK+1)
+#define TYPE_PI_UMUTEX		(TYPE_NORMAL_UMUTEX+1)
+#define TYPE_PP_UMUTEX		(TYPE_PI_UMUTEX+1)
+#define TYPE_RWLOCK		(TYPE_PP_UMUTEX+1)
 
 #define _UMUTEX_TRY		1
 #define _UMUTEX_WAIT		2
@@ -2770,7 +2771,7 @@ do_sem_wait(struct thread *td, struct _u
 
 	uq = td->td_umtxq;
 	flags = fuword32(&sem->_flags);
-	error = umtx_key_get(sem, TYPE_CV, GET_SHARE(flags), &uq->uq_key);
+	error = umtx_key_get(sem, TYPE_SEM, GET_SHARE(flags), &uq->uq_key);
 	if (error != 0)
 		return (error);
 	umtxq_lock(&uq->uq_key);
@@ -2845,7 +2846,7 @@ do_sem_wake(struct thread *td, struct _u
 	uint32_t flags;
 
 	flags = fuword32(&sem->_flags);
-	if ((error = umtx_key_get(sem, TYPE_CV, GET_SHARE(flags), &key)) != 0)
+	if ((error = umtx_key_get(sem, TYPE_SEM, GET_SHARE(flags), &key)) != 0)
 		return (error);	
 	umtxq_lock(&key);
 	umtxq_busy(&key);