CVS commit: [netbsd-7] src/sys/kern

[Jeff Rizzo]

Module Name:    src
Committed By:   riz
Date:           Fri Aug 15 23:57:51 UTC 2014

Modified Files:
        src/sys/kern [netbsd-7]: subr_prf.c

Log Message:
Pull up following revision(s) (requested by apb in ticket #26):
        sys/kern/subr_prf.c: revision 1.156
If mutex_tryenter() fails, don't call mutex_exit().


To generate a diff of this commit:
cvs rdiff -u -r1.154.2.1 -r1.154.2.2 src/sys/kern/subr_prf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/kern/subr_prf.c
diff -u src/sys/kern/subr_prf.c:1.154.2.1 src/sys/kern/subr_prf.c:1.154.2.2
--- src/sys/kern/subr_prf.c:1.154.2.1	Fri Aug 15 13:00:48 2014
+++ src/sys/kern/subr_prf.c	Fri Aug 15 23:57:51 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_prf.c,v 1.154.2.1 2014/08/15 13:00:48 martin Exp $	*/
+/*	$NetBSD: subr_prf.c,v 1.154.2.2 2014/08/15 23:57:51 riz Exp $	*/
 
 /*-
  * Copyright (c) 1986, 1988, 1991, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.154.2.1 2014/08/15 13:00:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.154.2.2 2014/08/15 23:57:51 riz Exp $");
 
 #include "opt_ddb.h"
 #include "opt_ipkdb.h"
@@ -161,8 +161,8 @@ static void kprintf_rnd_get(size_t bytes
 			/* This is optional but seems useful. */
 			SHA512_Update(&kprnd_sha, kprnd_accum,
 				      sizeof(kprnd_accum));
+			mutex_exit(&kprintf_mtx);
 		}
-		mutex_exit(&kprintf_mtx);
 	}
 }