From owner-svn-src-user@FreeBSD.ORG Tue Apr 27 17:29:44 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0E73F1065673; Tue, 27 Apr 2010 17:29:44 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id D1F878FC24; Tue, 27 Apr 2010 17:29:43 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 8716846B5B; Tue, 27 Apr 2010 13:29:43 -0400 (EDT) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPA id A985A8A025; Tue, 27 Apr 2010 13:29:42 -0400 (EDT) From: John Baldwin To: Kip Macy Date: Tue, 27 Apr 2010 13:06:49 -0400 User-Agent: KMail/1.12.1 (FreeBSD/7.3-CBSD-20100217; KDE/4.3.1; amd64; ; ) References: <201004240503.o3O53g0D028732@svn.freebsd.org> In-Reply-To: <201004240503.o3O53g0D028732@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201004271306.49294.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Tue, 27 Apr 2010 13:29:42 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.6 required=4.2 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: Re: svn commit: r207140 - in user/kmacy/head_page_lock_2/sys: amd64/amd64 kern sys X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Apr 2010 17:29:44 -0000 On Saturday 24 April 2010 1:03:42 am Kip Macy wrote: > Author: kmacy > Date: Sat Apr 24 05:03:42 2010 > New Revision: 207140 > URL: http://svn.freebsd.org/changeset/base/207140 > > Log: > generalize lock stack operations and move to subr_lock.c > > Modified: > user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c > user/kmacy/head_page_lock_2/sys/kern/kern_mutex.c > user/kmacy/head_page_lock_2/sys/kern/subr_lock.c > user/kmacy/head_page_lock_2/sys/sys/lock.h > > Modified: user/kmacy/head_page_lock_2/sys/kern/kern_mutex.c > ============================================================================== > --- user/kmacy/head_page_lock_2/sys/kern/kern_mutex.c Sat Apr 24 03:11:35 2010 (r207139) > +++ user/kmacy/head_page_lock_2/sys/kern/kern_mutex.c Sat Apr 24 05:03:42 2010 (r207140) > @@ -160,7 +185,7 @@ unlock_mtx(struct lock_object *lock) > struct mtx *m; > > m = (struct mtx *)lock; > - mtx_assert(m, MA_OWNED | MA_NOTRECURSED); > + mtx_assert(m, MA_OWNED); > mtx_unlock(m); > return (0); > } Note that this breaks the assertion used to prevent passing a recursed mutex to mtx_sleep() or cv_wait(). -- John Baldwin