 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_rndq.c,v 1.11 2013/06/13 00:55:01 tls Exp $	*/
+/*	$NetBSD: kern_rndq.c,v 1.12 2013/06/13 01:37:03 tls Exp $	*/
 /*-
  * Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Michael Graff <explorer@flame.org> and Thor Lancelot Simon.
  * This code uses ideas and algorithms from the Linux driver written by
  * Ted Ts'o.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -22,27 +22,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.11 2013/06/13 00:55:01 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.12 2013/06/13 01:37:03 tls Exp $");
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/select.h>
 #include <sys/poll.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 @@ -94,31 +94,26 @@ typedef struct _rnd_sample_t {
 	int		entropy;
 	u_int32_t	ts[RND_SAMPLE_COUNT];
 	u_int32_t	values[RND_SAMPLE_COUNT];
 } rnd_sample_t;
 /*
  * The event queue.  Fields are altered at an interrupt level.
  * All accesses must be protected with the mutex.
  */
 SIMPLEQ_HEAD(, _rnd_sample_t)	rnd_samples;
 kmutex_t			rnd_mtx;
 /*
  * This lock protects dispatch of our soft interrupts.
  */
 kmutex_t			rndsoft_mtx;
 /*
  * Entropy sinks: usually other generators waiting to be rekeyed.
+ *
  * A sink's callback MUST NOT re-add the sink to the list, or
  * list corruption will occur.  The list is protected by the
  * rndsink_mtx, which must be released before calling any sink's
  * callback.
  */
 TAILQ_HEAD(, rndsink)		rnd_sinks;
 kmutex_t			rndsink_mtx;
 /*
  * Memory pool for sample buffers
  */
 @@ -197,29 +192,29 @@ rnd_counter(void)
 		return (tv.tv_sec * 1000000 + tv.tv_usec);
+	}
 	/* when called from rnd_init, its too early to call microtime safely */
 	return (0);
+}
 /*
  * We may be called from low IPL -- protect our softint.
  */
 static inline void
 rnd_schedule_softint(void *softint)
+{
-	mutex_spin_enter(&rndsoft_mtx);
+	kpreempt_disable();
 	softint_schedule(softint);
-	mutex_spin_exit(&rndsoft_mtx);
+	kpreempt_enable();
+}
 /*
  * XXX repulsive: we can't initialize our softints in rnd_init
  * XXX (too early) so we wrap the points where we'd schedule them, thus.
  */
 static inline void
 rnd_schedule_process(void)
+{
 	if (__predict_true(rnd_process)) {
 		rnd_schedule_softint(rnd_process);
 		return;
+	}
 @@ -443,27 +438,26 @@ rnd_skew(void *arg)
  * rnd_init() must be called very early on in the boot process, so
  * the pool is ready for other devices to attach as sources.
  */
 void
 rnd_init(void)
+{
 	u_int32_t c;
 	if (rnd_ready)
 		return;
 	mutex_init(&rnd_mtx, MUTEX_DEFAULT, IPL_VM);
 	mutex_init(&rndsink_mtx, MUTEX_DEFAULT, IPL_VM);
 	mutex_init(&rndsoft_mtx, MUTEX_DEFAULT, IPL_VM);
 	/*
 	 * take a counter early, hoping that there's some variance in
 	 * the following operations
 	 */
 	c = rnd_counter();
 	LIST_INIT(&rnd_sources);
 	SIMPLEQ_INIT(&rnd_samples);
 	TAILQ_INIT(&rnd_sinks);
 	rndpool_init(&rnd_pool);
 	mutex_init(&rndpool_mtx, MUTEX_DEFAULT, IPL_VM);