Module Name: src
Committed By: riastradh
Date: Mon Apr 13 16:46:34 UTC 2015
Modified Files:
src/sys/kern: subr_autoconf.c subr_prf.c
src/sys/rump/dev/lib/libopencrypto: opencrypto_component.c
src/sys/rump/librump/rumpkern: hyperentropy.c rump.c
src/sys/uvm: uvm.h
Log Message:
Convert remaining MI <sys/rnd.h> stragglers. Many MD ones left.
To generate a diff of this commit:
cvs rdiff -u -r1.234 -r1.235 src/sys/kern/subr_autoconf.c
cvs rdiff -u -r1.157 -r1.158 src/sys/kern/subr_prf.c
cvs rdiff -u -r1.1 -r1.2 \
src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/librump/rumpkern/hyperentropy.c
cvs rdiff -u -r1.316 -r1.317 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.64 -r1.65 src/sys/uvm/uvm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.234 src/sys/kern/subr_autoconf.c:1.235
--- src/sys/kern/subr_autoconf.c:1.234 Fri Mar 6 09:28:15 2015
+++ src/sys/kern/subr_autoconf.c Mon Apr 13 16:46:33 2015
@@ -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_autocon
#include <sys/disk.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <machine/limits.h>
Index: src/sys/kern/subr_prf.c
diff -u src/sys/kern/subr_prf.c:1.157 src/sys/kern/subr_prf.c:1.158
--- src/sys/kern/subr_prf.c:1.157 Wed Feb 4 07:10:47 2015
+++ src/sys/kern/subr_prf.c Mon Apr 13 16:46:33 2015
@@ -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
#include <sys/kernel.h>
#include <sys/cpu.h>
#include <sys/sha2.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <dev/cons.h>
Index: src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c
diff -u src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c:1.1 src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c:1.2
--- src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c:1.1 Thu Mar 13 01:51:30 2014
+++ src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c Mon Apr 13 16:46:33 2015
@@ -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>
Index: src/sys/rump/librump/rumpkern/hyperentropy.c
diff -u src/sys/rump/librump/rumpkern/hyperentropy.c:1.7 src/sys/rump/librump/rumpkern/hyperentropy.c:1.8
--- src/sys/rump/librump/rumpkern/hyperentropy.c:1.7 Fri Aug 15 19:47:59 2014
+++ src/sys/rump/librump/rumpkern/hyperentropy.c Mon Apr 13 16:46:33 2015
@@ -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>
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.316 src/sys/rump/librump/rumpkern/rump.c:1.317
--- src/sys/rump/librump/rumpkern/rump.c:1.316 Fri Feb 6 18:19:22 2015
+++ src/sys/rump/librump/rumpkern/rump.c Mon Apr 13 16:46:33 2015
@@ -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.3
#include <sys/vmem.h>
#include <sys/xcall.h>
#include <sys/cprng.h>
+#include <sys/rnd.h>
#include <sys/ktrace.h>
#include <rump/rumpuser.h>
Index: src/sys/uvm/uvm.h
diff -u src/sys/uvm/uvm.h:1.64 src/sys/uvm/uvm.h:1.65
--- src/sys/uvm/uvm.h:1.64 Sun Aug 10 16:44:37 2014
+++ src/sys/uvm/uvm.h Mon Apr 13 16:46:33 2015
@@ -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
