Date: Thu, 6 Mar 2003 15:13:20 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 26451 for review Message-ID: <200303062313.h26NDKpI068016@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=26451 Change 26451 by jhb@jhb_laptop on 2003/03/06 15:12:31 Kill MTX_SLEEPABLE, witness would have panic'd anyways. Affected files ... .. //depot/projects/smpng/sys/kern/kern_mutex.c#62 edit .. //depot/projects/smpng/sys/sys/mutex.h#33 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#62 (text+ko) ==== @@ -920,7 +920,7 @@ struct lock_object *lock; MPASS((opts & ~(MTX_SPIN | MTX_QUIET | MTX_RECURSE | - MTX_SLEEPABLE | MTX_NOWITNESS | MTX_DUPOK)) == 0); + MTX_NOWITNESS | MTX_DUPOK)) == 0); #ifdef MUTEX_DEBUG /* Diagnostic and error correction */ @@ -941,8 +941,6 @@ lock->lo_flags = LO_QUIET; if (opts & MTX_RECURSE) lock->lo_flags |= LO_RECURSABLE; - if (opts & MTX_SLEEPABLE) - lock->lo_flags |= LO_SLEEPABLE; if ((opts & MTX_NOWITNESS) == 0) lock->lo_flags |= LO_WITNESS; if (opts & MTX_DUPOK) ==== //depot/projects/smpng/sys/sys/mutex.h#33 (text+ko) ==== @@ -56,7 +56,6 @@ #define MTX_SPIN 0x00000001 /* Spin lock (disables interrupts) */ #define MTX_RECURSE 0x00000004 /* Option: lock allowed to recurse */ #define MTX_NOWITNESS 0x00000008 /* Don't do any witness checking. */ -#define MTX_SLEEPABLE 0x00000010 /* We can sleep with this lock. */ #define MTX_DUPOK 0x00000020 /* Don't log a duplicate acquire */ /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200303062313.h26NDKpI068016>