Date: Tue, 27 Apr 2010 12:29:06 -0700 From: "K. Macy" <kmacy@freebsd.org> To: John Baldwin <jhb@freebsd.org> 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 Message-ID: <l2n82c4140e1004271229h88bb71e6s45822761295d85de@mail.gmail.com> In-Reply-To: <201004271306.49294.jhb@freebsd.org> References: <201004240503.o3O53g0D028732@svn.freebsd.org> <201004271306.49294.jhb@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Apr 27, 2010 at 10:06 AM, John Baldwin <jhb@freebsd.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?l2n82c4140e1004271229h88bb71e6s45822761295d85de>