diff options
| author | riastradh <riastradh@NetBSD.org> | 2015-04-13 22:43:41 +0000 |
|---|---|---|
| committer | riastradh <riastradh@NetBSD.org> | 2015-04-13 22:43:41 +0000 |
| commit | 98ce834549ea7d82db85e293426d5e8a2b5b198f (patch) | |
| tree | 5436f9a174c7d98f458cce95716845f0463215e2 /sys | |
| parent | 1bb987b6a87c445b2080a943ee458832bdbee798 (diff) | |
More rnd.h user cleanup.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/crypto/cprng_fast/cprng_fast.c | 6 | ||||
| -rw-r--r-- | sys/dev/rnd_private.h | 6 | ||||
| -rw-r--r-- | sys/kern/kern_rndpool.c | 6 | ||||
| -rw-r--r-- | sys/kern/kern_rndq.c | 6 | ||||
| -rw-r--r-- | sys/kern/kern_rndsink.c | 5 | ||||
| -rw-r--r-- | sys/kern/subr_cprng.c | 5 |
6 files changed, 18 insertions, 16 deletions
diff --git a/sys/crypto/cprng_fast/cprng_fast.c b/sys/crypto/cprng_fast/cprng_fast.c index 390af62a6e5..cc17dfe9a88 100644 --- a/sys/crypto/cprng_fast/cprng_fast.c +++ b/sys/crypto/cprng_fast/cprng_fast.c @@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: cprng_fast.c,v 1.12 2015/04/13 15:51:00 riastradh Ex #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 --git a/sys/dev/rnd_private.h b/sys/dev/rnd_private.h index cb36c399491..ec03520ac40 100644 --- a/sys/dev/rnd_private.h +++ b/sys/dev/rnd_private.h @@ -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 --git a/sys/kern/kern_rndpool.c b/sys/kern/kern_rndpool.c index 0721542c0b8..f7a637b1884 100644 --- a/sys/kern/kern_rndpool.c +++ b/sys/kern/kern_rndpool.c @@ -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 --git a/sys/kern/kern_rndq.c b/sys/kern/kern_rndq.c index 28436c7b551..e05d7bbae43 100644 --- a/sys/kern/kern_rndq.c +++ b/sys/kern/kern_rndq.c @@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.46 2015/04/13 15:23:01 riastradh Exp #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 --git a/sys/kern/kern_rndsink.c b/sys/kern/kern_rndsink.c index 55f1ed1ee74..81cb1efd463 100644 --- a/sys/kern/kern_rndsink.c +++ b/sys/kern/kern_rndsink.c @@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: kern_rndsink.c,v 1.12 2015/04/13 15:13:50 riastradh #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 --git a/sys/kern/subr_cprng.c b/sys/kern/subr_cprng.c index 4f07c238924..f7d1a8a833e 100644 --- a/sys/kern/subr_cprng.c +++ b/sys/kern/subr_cprng.c @@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.26 2014/11/19 14:25:00 christos Exp #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> |
