[src/trunk]: src/sys Convert remaining MI <sys/rnd.h> stragglers. Many MD on...

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

details:   https://anonhg.NetBSD.org/src/rev/4bc5f8bc2490
branches:  trunk
changeset: 337378:4bc5f8bc2490
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Apr 13 16:46:33 2015 +0000

description:
Convert remaining MI <sys/rnd.h> stragglers.  Many MD ones left.

diffstat:

 sys/kern/subr_autoconf.c                              |  6 +++---
 sys/kern/subr_prf.c                                   |  6 +++---
 sys/rump/dev/lib/libopencrypto/opencrypto_component.c |  5 ++---
 sys/rump/librump/rumpkern/hyperentropy.c              |  7 ++++---
 sys/rump/librump/rumpkern/rump.c                      |  5 +++--
 sys/uvm/uvm.h                                         |  4 ++--
 6 files changed, 17 insertions(+), 16 deletions(-)

diffs (146 lines):

diff -r 092ce4369fc5 -r 4bc5f8bc2490 sys/kern/subr_autoconf.c
--- a/sys/kern/subr_autoconf.c  Mon Apr 13 16:36:54 2015 +0000
+++ b/sys/kern/subr_autoconf.c  Mon Apr 13 16:46:33 2015 +0000
@@ -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 @@
 
 #include <sys/disk.h>
 
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
 
 #include <machine/limits.h>
 
diff -r 092ce4369fc5 -r 4bc5f8bc2490 sys/kern/subr_prf.c
--- a/sys/kern/subr_prf.c       Mon Apr 13 16:36:54 2015 +0000
+++ b/sys/kern/subr_prf.c       Mon Apr 13 16:46:33 2015 +0000
@@ -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 @@
 #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 -r 092ce4369fc5 -r 4bc5f8bc2490 sys/rump/dev/lib/libopencrypto/opencrypto_component.c
--- a/sys/rump/dev/lib/libopencrypto/opencrypto_component.c     Mon Apr 13 16:36:54 2015 +0000
+++ b/sys/rump/dev/lib/libopencrypto/opencrypto_component.c     Mon Apr 13 16:46:33 2015 +0000
@@ -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 -r 092ce4369fc5 -r 4bc5f8bc2490 sys/rump/librump/rumpkern/hyperentropy.c
--- a/sys/rump/librump/rumpkern/hyperentropy.c  Mon Apr 13 16:36:54 2015 +0000
+++ b/sys/rump/librump/rumpkern/hyperentropy.c  Mon Apr 13 16:46:33 2015 +0000
@@ -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 -r 092ce4369fc5 -r 4bc5f8bc2490 sys/rump/librump/rumpkern/rump.c
--- a/sys/rump/librump/rumpkern/rump.c  Mon Apr 13 16:36:54 2015 +0000
+++ b/sys/rump/librump/rumpkern/rump.c  Mon Apr 13 16:46:33 2015 +0000
@@ -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 @@
 #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 -r 092ce4369fc5 -r 4bc5f8bc2490 sys/uvm/uvm.h
--- a/sys/uvm/uvm.h     Mon Apr 13 16:36:54 2015 +0000
+++ b/sys/uvm/uvm.h     Mon Apr 13 16:46:33 2015 +0000
@@ -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