From owner-cvs-all@FreeBSD.ORG Fri Jan 6 22:54:20 2006 Return-Path: <owner-cvs-all@FreeBSD.ORG> X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A09DB16A41F; Fri, 6 Jan 2006 22:54:20 +0000 (GMT) (envelope-from des@des.no) Received: from tim.des.no (tim.des.no [194.63.250.121]) by mx1.FreeBSD.org (Postfix) with ESMTP id 127EA43D46; Fri, 6 Jan 2006 22:54:19 +0000 (GMT) (envelope-from des@des.no) Received: from tim.des.no (localhost [127.0.0.1]) by spam.des.no (Postfix) with ESMTP id A934120AB; Fri, 6 Jan 2006 23:54:14 +0100 (CET) X-Spam-Tests: AWL,BAYES_00,FORGED_RCVD_HELO X-Spam-Learn: ham X-Spam-Score: -3.2/3.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on tim.des.no Received: from xps.des.no (des.no [80.203.243.180]) by tim.des.no (Postfix) with ESMTP id 97F8320AA; Fri, 6 Jan 2006 23:54:14 +0100 (CET) Received: by xps.des.no (Postfix, from userid 1001) id 5F28233C3E; Fri, 6 Jan 2006 23:54:14 +0100 (CET) To: John Baldwin <jhb@FreeBSD.org> References: <200601061807.k06I7WHQ034800@repoman.freebsd.org> From: des@des.no (=?iso-8859-1?q?Dag-Erling_Sm=F8rgrav?=) Date: Fri, 06 Jan 2006 23:54:14 +0100 In-Reply-To: <200601061807.k06I7WHQ034800@repoman.freebsd.org> (John Baldwin's message of "Fri, 6 Jan 2006 18:07:32 +0000 (UTC)") Message-ID: <86mzi955nt.fsf@xps.des.no> User-Agent: Gnus/5.110002 (No Gnus v0.2) Emacs/21.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/kern kern_mutex.c kern_sx.c subr_witness.c src/sys/sys _lock.h lock.h X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>, <mailto:cvs-all-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/cvs-all> List-Post: <mailto:cvs-all@freebsd.org> List-Help: <mailto:cvs-all-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>, <mailto:cvs-all-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 06 Jan 2006 22:54:20 -0000 --=-=-= Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable John Baldwin <jhb@FreeBSD.org> writes: > Log: > Trim another pointer from struct lock_object (and thus from struct mtx = and > struct sx). [...] Missed one... DES --=20 Dag-Erling Sm=F8rgrav - des@des.no --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=kern_mutex.diff Index: sys/kern/kern_mutex.c =================================================================== RCS file: /home/ncvs/src/sys/kern/kern_mutex.c,v retrieving revision 1.160 diff -u -r1.160 kern_mutex.c --- sys/kern/kern_mutex.c 6 Jan 2006 18:07:31 -0000 1.160 +++ sys/kern/kern_mutex.c 6 Jan 2006 22:52:21 -0000 @@ -884,7 +884,7 @@ MPASS((m->mtx_lock & (MTX_RECURSED|MTX_CONTESTED)) == 0); /* Perform the non-mtx related part of mtx_unlock_spin(). */ - if (m->mtx_object.lo_class == &lock_class_mtx_spin) + if (LO_CLASSINDEX(&m->mtx_object) == LOCK_CLASS_SPIN_MUTEX) spinlock_exit(); /* Tell witness this isn't locked to make it happy. */ --=-=-=--