summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2015-04-14 12:14:09 +0000
committerriastradh <riastradh@NetBSD.org>2015-04-14 12:14:09 +0000
commit6da76e5d678d59bbfd0eb479d46f501a96c3dd07 (patch)
tree7b14b9dd491d3e37e03c3d57047063cdd78a9103 /sys/dev
parent7d58ee770f7f7b4b94084ef78c2a9b4b5bb37a84 (diff)
Use rnd_add_data, not rndpool_mtx and rndpool_add_data.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/rndpseudo.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/sys/dev/rndpseudo.c b/sys/dev/rndpseudo.c
index c46f382a6e0..5651b2bb2b3 100644
--- a/sys/dev/rndpseudo.c
+++ b/sys/dev/rndpseudo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rndpseudo.c,v 1.26 2015/04/13 15:13:50 riastradh Exp $ */
+/* $NetBSD: rndpseudo.c,v 1.27 2015/04/14 12:14:09 riastradh Exp $ */
/*-
* Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.26 2015/04/13 15:13:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.27 2015/04/14 12:14:09 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -190,9 +190,7 @@ rndattach(int num)
/* Mix in another counter. */
c = rndpseudo_counter();
- mutex_spin_enter(&rndpool_mtx);
- rndpool_add_data(&rnd_pool, &c, sizeof(c), 1);
- mutex_spin_exit(&rndpool_mtx);
+ rnd_add_data(NULL, &c, sizeof(c), 1);
}
int
@@ -483,9 +481,7 @@ rnd_write(struct file *fp, off_t *offp, struct uio *uio,
/*
* Mix in the bytes.
*/
- mutex_spin_enter(&rndpool_mtx);
- rndpool_add_data(&rnd_pool, bf, n, estimate);
- mutex_spin_exit(&rndpool_mtx);
+ rnd_add_data(NULL, bf, n, estimate);
added += n;
DPRINTF(RND_DEBUG_WRITE, ("Random: Copied in %d bytes\n", n));