From owner-svn-src-user@FreeBSD.ORG Tue Apr 27 19:53:47 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 23BF41065672 for ; Tue, 27 Apr 2010 19:53:47 +0000 (UTC) (envelope-from kmatthew.macy@gmail.com) Received: from mail-qy0-f181.google.com (mail-qy0-f181.google.com [209.85.221.181]) by mx1.freebsd.org (Postfix) with ESMTP id CEB258FC1A for ; Tue, 27 Apr 2010 19:53:46 +0000 (UTC) Received: by qyk11 with SMTP id 11so17066633qyk.13 for ; Tue, 27 Apr 2010 12:53:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:reply-to:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=hFy5LgWrF8vnzW6oLg1RLxH2AbDPAAbnRfzNdy7eEFQ=; b=MsBfwomhqnly209lFtylBXj2zKSauzM4/34FIq/XYFzNEidjdaKRA7UP0mDQUj745D KLDZ480njWCvZKrBA8TPS4Q6GFSTTSpYvYaUyW5QD4JA8+rji/gIu5LITQnFdl2qSqXy rJzsF0hn88NgV4zbQ7Q70dlqneLz21gKStvbY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:reply-to:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=O/Bf/iIk/Idq5czT6LDtnyOUZvoz0OaFk90YlJlUmZW2P2WD+89xVRpk4jPEkqvqgA TODGiIn+nlrhi9bz4NmH7hntYR1dgCNr7lTZzpfRCjzdVWjpqynmjiU4zdAUMSTD3kCu m7uza9xNzOIdSyFeJF+jbxCSL0ANnHnzm2U5o= MIME-Version: 1.0 Received: by 10.229.237.204 with SMTP id kp12mr425167qcb.27.1272396547221; Tue, 27 Apr 2010 12:29:07 -0700 (PDT) Sender: kmatthew.macy@gmail.com Received: by 10.229.231.18 with HTTP; Tue, 27 Apr 2010 12:29:06 -0700 (PDT) In-Reply-To: <201004271306.49294.jhb@freebsd.org> References: <201004240503.o3O53g0D028732@svn.freebsd.org> <201004271306.49294.jhb@freebsd.org> Date: Tue, 27 Apr 2010 12:29:06 -0700 X-Google-Sender-Auth: 4cadcb71789d8beb Message-ID: From: "K. Macy" To: John Baldwin Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable 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 Reply-To: kmacy@freebsd.org 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 19:53:47 -0000 On Tue, Apr 27, 2010 at 10:06 AM, John Baldwin wrote: > 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: >> =A0 generalize lock stack operations and move to subr_lock.c >> >> Modified: >> =A0 user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c >> =A0 user/kmacy/head_page_lock_2/sys/kern/kern_mutex.c >> =A0 user/kmacy/head_page_lock_2/sys/kern/subr_lock.c >> =A0 user/kmacy/head_page_lock_2/sys/sys/lock.h >> >> Modified: user/kmacy/head_page_lock_2/sys/kern/kern_mutex.c >> > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- user/kmacy/head_page_lock_2/sys/kern/kern_mutex.c Sat Apr 24 03:11:3= 5 > 2010 =A0 =A0(r207139) >> +++ user/kmacy/head_page_lock_2/sys/kern/kern_mutex.c Sat Apr 24 05:03:4= 2 > 2010 =A0 =A0(r207140) >> @@ -160,7 +185,7 @@ unlock_mtx(struct lock_object *lock) >> =A0 =A0 =A0 struct mtx *m; >> >> =A0 =A0 =A0 m =3D (struct mtx *)lock; >> - =A0 =A0 mtx_assert(m, MA_OWNED | MA_NOTRECURSED); >> + =A0 =A0 mtx_assert(m, MA_OWNED); >> =A0 =A0 =A0 mtx_unlock(m); >> =A0 =A0 =A0 return (0); >> =A0} > > Note that this breaks the assertion used to prevent passing a recursed mu= tex > to mtx_sleep() or cv_wait(). > Thanks. MA_NOTRECURSED breaks its use in lock_stack, I'll add another function for it too. -Kip