Date: Thu, 14 Feb 2008 21:23:30 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 135416 for review Message-ID: <200802142123.m1ELNUgc036447@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=135416 Change 135416 by jhb@jhb_mutex on 2008/02/14 21:23:12 Bah, merge fixes so this branch boots. Affected files ... .. //depot/projects/smpng/sys/dev/syscons/syscons.h#19 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#35 edit Differences ... ==== //depot/projects/smpng/sys/dev/syscons/syscons.h#19 (text+ko) ==== @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/syscons/syscons.h,v 1.89 2007/12/29 21:55:24 wkoszek Exp $ + * $FreeBSD: src/sys/dev/syscons/syscons.h,v 1.90 2008/02/13 23:38:08 jhb Exp $ */ #ifndef _DEV_SYSCONS_SYSCONS_H_ @@ -517,7 +517,8 @@ #define ISSIGVALID(sig) ((sig) > 0 && (sig) < NSIG) #define SC_VIDEO_LOCKINIT(sc) \ - mtx_init(&(sc)->video_mtx, "syscons video lock", NULL,MTX_SPIN); + mtx_init(&(sc)->video_mtx, "syscons video lock", NULL, \ + MTX_SPIN | MTX_RECURSE); #define SC_VIDEO_LOCK(sc) \ do { \ if (!cold) \ ==== //depot/projects/smpng/sys/kern/subr_sleepqueue.c#35 (text+ko) ==== @@ -177,7 +177,7 @@ for (i = 0; i < SC_TABLESIZE; i++) { LIST_INIT(&sleepq_chains[i].sc_queues); mtx_init(&sleepq_chains[i].sc_lock, "sleepq chain", NULL, - MTX_SPIN); + MTX_SPIN | MTX_RECURSE); #ifdef SLEEPQUEUE_PROFILING snprintf(chain_name, sizeof(chain_name), "%d", i); chain_oid = SYSCTL_ADD_NODE(NULL,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802142123.m1ELNUgc036447>