[src/trunk]: src/sys More rnd.h user cleanup.

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

details:   https://anonhg.NetBSD.org/src/rev/25730e1d5c66
branches:  trunk
changeset: 337405:25730e1d5c66
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Apr 13 22:43:41 2015 +0000

description:
More rnd.h user cleanup.

diffstat:

 sys/crypto/cprng_fast/cprng_fast.c |  6 +++---
 sys/dev/rnd_private.h              |  6 ++++--
 sys/kern/kern_rndpool.c            |  6 +++---
 sys/kern/kern_rndq.c               |  6 ++++--
 sys/kern/kern_rndsink.c            |  5 ++---
 sys/kern/subr_cprng.c              |  5 ++---
 6 files changed, 18 insertions(+), 16 deletions(-)

diffs (152 lines):

diff -r 7fde71267aaf -r 25730e1d5c66 sys/crypto/cprng_fast/cprng_fast.c
--- a/sys/crypto/cprng_fast/cprng_fast.c        Mon Apr 13 22:26:20 2015 +0000
+++ b/sys/crypto/cprng_fast/cprng_fast.c        Mon Apr 13 22:43:41 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cprng_fast.c,v 1.12 2015/04/13 15:51:00 riastradh Exp $        */
+/*     $NetBSD: cprng_fast.c,v 1.13 2015/04/13 22:43:41 riastradh Exp $        */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cprng_fast.c,v 1.12 2015/04/13 15:51:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cprng_fast.c,v 1.13 2015/04/13 22:43:41 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -39,7 +39,7 @@
 #include <sys/cpu.h>
 #include <sys/intr.h>
 #include <sys/percpu.h>
-#include <sys/rnd.h>
+#include <sys/rnd.h>           /* rnd_initial_entropy */
 
 /* ChaCha core */
 
diff -r 7fde71267aaf -r 25730e1d5c66 sys/dev/rnd_private.h
--- a/sys/dev/rnd_private.h     Mon Apr 13 22:26:20 2015 +0000
+++ b/sys/dev/rnd_private.h     Mon Apr 13 22:43:41 2015 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: rnd_private.h,v 1.7 2015/04/13 15:13:50 riastradh Exp $     */
+/*      $NetBSD: rnd_private.h,v 1.8 2015/04/13 22:43:41 riastradh Exp $     */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -36,7 +36,9 @@
 #include <sys/types.h>
 #include <sys/mutex.h>
 #include <sys/queue.h>
-#include <sys/rnd.h>
+#include <sys/rndio.h>
+#include <sys/rndsource.h>
+#include <sys/rndpool.h>
 
 /*
  * Number of bytes returned per hash.  This value is used in both
diff -r 7fde71267aaf -r 25730e1d5c66 sys/kern/kern_rndpool.c
--- a/sys/kern/kern_rndpool.c   Mon Apr 13 22:26:20 2015 +0000
+++ b/sys/kern/kern_rndpool.c   Mon Apr 13 22:43:41 2015 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: kern_rndpool.c,v 1.8 2015/04/08 13:45:01 riastradh Exp $        */
+/*      $NetBSD: kern_rndpool.c,v 1.9 2015/04/13 22:43:41 riastradh Exp $        */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,13 +31,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rndpool.c,v 1.8 2015/04/08 13:45:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndpool.c,v 1.9 2015/04/13 22:43:41 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sha1.h>
 
-#include <sys/rnd.h>
+#include <sys/rndpool.h>
 #include <dev/rnd_private.h>
 
 /*
diff -r 7fde71267aaf -r 25730e1d5c66 sys/kern/kern_rndq.c
--- a/sys/kern/kern_rndq.c      Mon Apr 13 22:26:20 2015 +0000
+++ b/sys/kern/kern_rndq.c      Mon Apr 13 22:43:41 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_rndq.c,v 1.46 2015/04/13 15:23:01 riastradh Exp $ */
+/*     $NetBSD: kern_rndq.c,v 1.47 2015/04/13 22:43:41 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.46 2015/04/13 15:23:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.47 2015/04/13 22:43:41 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -49,7 +49,9 @@
 #include <sys/callout.h>
 #include <sys/intr.h>
 #include <sys/rnd.h>
+#include <sys/rndpool.h>
 #include <sys/rndsink.h>
+#include <sys/rndsource.h>
 #include <sys/vnode.h>
 #include <sys/pool.h>
 #include <sys/kauth.h>
diff -r 7fde71267aaf -r 25730e1d5c66 sys/kern/kern_rndsink.c
--- a/sys/kern/kern_rndsink.c   Mon Apr 13 22:26:20 2015 +0000
+++ b/sys/kern/kern_rndsink.c   Mon Apr 13 22:43:41 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_rndsink.c,v 1.12 2015/04/13 15:13:50 riastradh Exp $      */
+/*     $NetBSD: kern_rndsink.c,v 1.13 2015/04/13 22:43:41 riastradh Exp $      */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rndsink.c,v 1.12 2015/04/13 15:13:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndsink.c,v 1.13 2015/04/13 22:43:41 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -38,7 +38,6 @@
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <sys/queue.h>
-#include <sys/rnd.h>
 #include <sys/rndsink.h>
 
 #include <dev/rnd_private.h>
diff -r 7fde71267aaf -r 25730e1d5c66 sys/kern/subr_cprng.c
--- a/sys/kern/subr_cprng.c     Mon Apr 13 22:26:20 2015 +0000
+++ b/sys/kern/subr_cprng.c     Mon Apr 13 22:43:41 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_cprng.c,v 1.26 2014/11/19 14:25:00 christos Exp $ */
+/*     $NetBSD: subr_cprng.c,v 1.27 2015/04/13 22:43:41 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2011-2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.26 2014/11/19 14:25:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.27 2015/04/13 22:43:41 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -48,7 +48,6 @@
 #include <sys/select.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
-#include <sys/rnd.h>
 #include <sys/rndsink.h>
 #if DIAGNOSTIC
 #include <sys/rngtest.h>