[src/netbsd-7]: src/sys/kern Pull up following revision(s) (requested by apb ...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ac66a5ccc26c
branches:  netbsd-7
changeset: 798255:ac66a5ccc26c
user:      riz <riz%NetBSD.org@localhost>
date:      Fri Aug 15 23:57:51 2014 +0000

description:
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().

diffstat:

 sys/kern/subr_prf.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r e3d58c6b52bc -r ac66a5ccc26c sys/kern/subr_prf.c
--- a/sys/kern/subr_prf.c       Fri Aug 15 13:07:37 2014 +0000
+++ b/sys/kern/subr_prf.c       Fri Aug 15 23:57:51 2014 +0000
@@ -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 @@
                        /* This is optional but seems useful. */
                        SHA512_Update(&kprnd_sha, kprnd_accum,
                                      sizeof(kprnd_accum));
+                       mutex_exit(&kprintf_mtx);
                }
-               mutex_exit(&kprintf_mtx);
        }
 }