[src/trunk]: src/sys/kern Oops -- we already hold rndpool_mtx here.

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

details:   https://anonhg.NetBSD.org/src/rev/175c8d13fe7d
branches:  trunk
changeset: 337245:175c8d13fe7d
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Apr 08 03:14:29 2015 +0000

description:
Oops -- we already hold rndpool_mtx here.

diffstat:

 sys/kern/kern_rndq.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 535d0e0e6cbe -r 175c8d13fe7d sys/kern/kern_rndq.c
--- a/sys/kern/kern_rndq.c      Wed Apr 08 03:00:31 2015 +0000
+++ b/sys/kern/kern_rndq.c      Wed Apr 08 03:14:29 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_rndq.c,v 1.36 2015/04/08 03:00:31 riastradh Exp $ */
+/*     $NetBSD: kern_rndq.c,v 1.37 2015/04/08 03:14:29 riastradh Exp $ */
 
 /*-
  * Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.36 2015/04/08 03:00:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.37 2015/04/08 03:14:29 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -1097,9 +1097,7 @@
                 */
                if (source->type == RND_TYPE_RNG) {
                        if (__predict_false(rnd_hwrng_test(sample))) {
-                               mutex_spin_enter(&rndpool_mtx);
                                source->flags |= RND_FLAG_NO_COLLECT;
-                               mutex_spin_exit(&rndpool_mtx);
                                rnd_printf("rnd: disabling source \"%s\".",
                                    badsource->name);
                                goto skip;