From owner-p4-projects@FreeBSD.ORG  Mon Jan 26 15:29:04 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C0E9E1065672; Mon, 26 Jan 2009 15:29:03 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7F4F3106566B
	for <perforce@freebsd.org>; Mon, 26 Jan 2009 15:29:03 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6D48C8FC0A
	for <perforce@freebsd.org>; Mon, 26 Jan 2009 15:29:03 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0QFT372034390
	for <perforce@freebsd.org>; Mon, 26 Jan 2009 15:29:03 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0QFT3ca034388
	for perforce@freebsd.org; Mon, 26 Jan 2009 15:29:03 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 26 Jan 2009 15:29:03 GMT
Message-Id: <200901261529.n0QFT3ca034388@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 156687 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: Mon, 26 Jan 2009 15:29:04 -0000

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

Change 156687 by jhb@jhb_jhbbsd on 2009/01/26 15:28:50

	Drop these changes.

Affected files ...

.. //depot/projects/smpng/sys/vm/uma_core.c#76 edit
.. //depot/projects/smpng/sys/vm/uma_int.h#33 edit

Differences ...

==== //depot/projects/smpng/sys/vm/uma_core.c#76 (text+ko) ====

@@ -1308,7 +1308,10 @@
 	/*
 	 * Initialize keg's lock (shared among zones).
 	 */
-	KEG_LOCK_INIT(keg, arg->flags & UMA_ZONE_MTXCLASS);
+	if (arg->flags & UMA_ZONE_MTXCLASS)
+		KEG_LOCK_INIT(keg, 1);
+	else
+		KEG_LOCK_INIT(keg, 0);
 
 	/*
 	 * If we're putting the slab header in the actual page we need to
@@ -1403,6 +1406,7 @@
 		KASSERT(arg->keg != NULL, ("Secondary zone on zero'd keg"));
 		zone->uz_init = arg->uminit;
 		zone->uz_fini = arg->fini;
+		zone->uz_lock = &keg->uk_lock;
 		zone->uz_flags |= UMA_ZONE_SECONDARY;
 		mtx_lock(&uma_mtx);
 		ZONE_LOCK(zone);

==== //depot/projects/smpng/sys/vm/uma_int.h#33 (text+ko) ====

@@ -358,12 +358,12 @@
 			mtx_init(&(k)->uk_lock, (k)->uk_name,	\
 			    "UMA zone", MTX_DEF | MTX_DUPOK);	\
 	} while (0)
+	    
 #define	KEG_LOCK_FINI(k)	mtx_destroy(&(k)->uk_lock)
 #define	KEG_LOCK(k)	mtx_lock(&(k)->uk_lock)
 #define	KEG_UNLOCK(k)	mtx_unlock(&(k)->uk_lock)
-
-#define	ZONE_LOCK(z)	mtx_lock(&(z)->uz_keg->uk_lock)
-#define ZONE_UNLOCK(z)	mtx_unlock(&(z)->uz_keg->uk_lock)
+#define	ZONE_LOCK(z)	mtx_lock((z)->uz_lock)
+#define ZONE_UNLOCK(z)	mtx_unlock((z)->uz_lock)
 
 /*
  * Find a slab within a hash table.  This is used for OFFPAGE zones to lookup