diff options
| author | riastradh <riastradh@NetBSD.org> | 2015-04-13 16:46:33 +0000 |
|---|---|---|
| committer | riastradh <riastradh@NetBSD.org> | 2015-04-13 16:46:33 +0000 |
| commit | 2691e9df398e5845998e2c2346ef6f59cd7cb296 (patch) | |
| tree | 1ce714a7d81a1d72acabcf23d0ed6671d50909ae | |
| parent | f43f490196a482ac5dbd051527a9a27f94bef0bf (diff) | |
Convert remaining MI <sys/rnd.h> stragglers. Many MD ones left.
| -rw-r--r-- | sys/kern/subr_autoconf.c | 6 | ||||
| -rw-r--r-- | sys/kern/subr_prf.c | 6 | ||||
| -rw-r--r-- | sys/rump/dev/lib/libopencrypto/opencrypto_component.c | 5 | ||||
| -rw-r--r-- | sys/rump/librump/rumpkern/hyperentropy.c | 7 | ||||
| -rw-r--r-- | sys/rump/librump/rumpkern/rump.c | 5 | ||||
| -rw-r--r-- | sys/uvm/uvm.h | 4 |
6 files changed, 17 insertions, 16 deletions
diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c index f5c5ea8a5c6..723114fa921 100644 --- a/sys/kern/subr_autoconf.c +++ b/sys/kern/subr_autoconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: subr_autoconf.c,v 1.234 2015/03/06 09:28:15 mrg Exp $ */ +/* $NetBSD: subr_autoconf.c,v 1.235 2015/04/13 16:46:33 riastradh Exp $ */ /* * Copyright (c) 1996, 2000 Christopher G. Demetriou @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.234 2015/03/06 09:28:15 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.235 2015/04/13 16:46:33 riastradh Exp $"); #ifdef _KERNEL_OPT #include "opt_ddb.h" @@ -110,7 +110,7 @@ __KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.234 2015/03/06 09:28:15 mrg Exp #include <sys/disk.h> -#include <sys/rnd.h> +#include <sys/rndsource.h> #include <machine/limits.h> diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index 9e8581581c2..43c17237c64 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -1,4 +1,4 @@ -/* $NetBSD: subr_prf.c,v 1.157 2015/02/04 07:10:47 msaitoh Exp $ */ +/* $NetBSD: subr_prf.c,v 1.158 2015/04/13 16:46:33 riastradh Exp $ */ /*- * Copyright (c) 1986, 1988, 1991, 1993 @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.157 2015/02/04 07:10:47 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.158 2015/04/13 16:46:33 riastradh Exp $"); #include "opt_ddb.h" #include "opt_ipkdb.h" @@ -65,7 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.157 2015/02/04 07:10:47 msaitoh Exp $ #include <sys/kernel.h> #include <sys/cpu.h> #include <sys/sha2.h> -#include <sys/rnd.h> +#include <sys/rndsource.h> #include <dev/cons.h> diff --git a/sys/rump/dev/lib/libopencrypto/opencrypto_component.c b/sys/rump/dev/lib/libopencrypto/opencrypto_component.c index 1286f745c41..cb76cdfc780 100644 --- a/sys/rump/dev/lib/libopencrypto/opencrypto_component.c +++ b/sys/rump/dev/lib/libopencrypto/opencrypto_component.c @@ -1,4 +1,4 @@ -/* $NetBSD: opencrypto_component.c,v 1.1 2014/03/13 01:51:30 pooka Exp $ */ +/* $NetBSD: opencrypto_component.c,v 1.2 2015/04/13 16:46:33 riastradh Exp $ */ /* * Copyright (c) 2009 Antti Kantee. All Rights Reserved. @@ -26,12 +26,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opencrypto_component.c,v 1.1 2014/03/13 01:51:30 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opencrypto_component.c,v 1.2 2015/04/13 16:46:33 riastradh Exp $"); #include <sys/param.h> #include <sys/conf.h> #include <sys/device.h> -#include <sys/rnd.h> #include <sys/stat.h> #include <sys/module.h> diff --git a/sys/rump/librump/rumpkern/hyperentropy.c b/sys/rump/librump/rumpkern/hyperentropy.c index 263aed5197c..bc3db80bdf3 100644 --- a/sys/rump/librump/rumpkern/hyperentropy.c +++ b/sys/rump/librump/rumpkern/hyperentropy.c @@ -1,4 +1,4 @@ -/* $NetBSD: hyperentropy.c,v 1.7 2014/08/15 19:47:59 riastradh Exp $ */ +/* $NetBSD: hyperentropy.c,v 1.8 2015/04/13 16:46:33 riastradh Exp $ */ /* * Copyright (c) 2014 Antti Kantee. All Rights Reserved. @@ -26,12 +26,13 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hyperentropy.c,v 1.7 2014/08/15 19:47:59 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hyperentropy.c,v 1.8 2015/04/13 16:46:33 riastradh Exp $"); #include <sys/param.h> #include <sys/atomic.h> #include <sys/kmem.h> -#include <sys/rnd.h> +#include <sys/rndpool.h> +#include <sys/rndsource.h> #include <rump/rumpuser.h> diff --git a/sys/rump/librump/rumpkern/rump.c b/sys/rump/librump/rumpkern/rump.c index 2cd4014b367..0d26af709ba 100644 --- a/sys/rump/librump/rumpkern/rump.c +++ b/sys/rump/librump/rumpkern/rump.c @@ -1,4 +1,4 @@ -/* $NetBSD: rump.c,v 1.316 2015/02/06 18:19:22 maxv Exp $ */ +/* $NetBSD: rump.c,v 1.317 2015/04/13 16:46:33 riastradh Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.316 2015/02/06 18:19:22 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.317 2015/04/13 16:46:33 riastradh Exp $"); #include <sys/systm.h> #define ELFSIZE ARCH_ELFSIZE @@ -71,6 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.316 2015/02/06 18:19:22 maxv Exp $"); #include <sys/vmem.h> #include <sys/xcall.h> #include <sys/cprng.h> +#include <sys/rnd.h> #include <sys/ktrace.h> #include <rump/rumpuser.h> diff --git a/sys/uvm/uvm.h b/sys/uvm/uvm.h index aa36902be38..afa2fb6d353 100644 --- a/sys/uvm/uvm.h +++ b/sys/uvm/uvm.h @@ -1,4 +1,4 @@ -/* $NetBSD: uvm.h,v 1.64 2014/08/10 16:44:37 tls Exp $ */ +/* $NetBSD: uvm.h,v 1.65 2015/04/13 16:46:33 riastradh Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -59,7 +59,7 @@ #include <uvm/uvm_pager.h> #include <uvm/uvm_pdaemon.h> #include <uvm/uvm_swap.h> -#include <sys/rnd.h> +#include <sys/rndsource.h> #ifdef _KERNEL |
