summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2015-04-13 16:33:23 +0000
committerriastradh <riastradh@NetBSD.org>2015-04-13 16:33:23 +0000
commit7c77bcc9fb150f676afe7ea397a4b6b38f6c4bea (patch)
treeddd8789fa7909f8ec793654e6d927ce3c939f9ca /sys/dev
parent4724eea7ca10acc0d12535e3014d0af137a51fe2 (diff)
Convert sys/dev to use <sys/rndsource.h>.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/acpi/fdc_acpi.c6
-rw-r--r--sys/dev/ata/ld_ataraid.c5
-rw-r--r--sys/dev/ata/wd.c6
-rw-r--r--sys/dev/ata/wdvar.h4
-rw-r--r--sys/dev/cardbus/if_fxp_cardbus.c6
-rw-r--r--sys/dev/cardbus/if_rtk_cardbus.c6
-rw-r--r--sys/dev/cardbus/rbus_ppb.c6
-rw-r--r--sys/dev/gpib/rd.c6
-rw-r--r--sys/dev/i2o/ld_iop.c5
-rw-r--r--sys/dev/ic/am7990.c6
-rw-r--r--sys/dev/ic/am79900.c6
-rw-r--r--sys/dev/ic/com.c8
-rw-r--r--sys/dev/ic/comvar.h5
-rw-r--r--sys/dev/ic/cs89x0.c6
-rw-r--r--sys/dev/ic/cs89x0var.h4
-rw-r--r--sys/dev/ic/dp8390.c6
-rw-r--r--sys/dev/ic/dp8390var.h4
-rw-r--r--sys/dev/ic/elink3.c6
-rw-r--r--sys/dev/ic/elink3var.h4
-rw-r--r--sys/dev/ic/elinkxl.c6
-rw-r--r--sys/dev/ic/elinkxlvar.h4
-rw-r--r--sys/dev/ic/gemvar.h4
-rw-r--r--sys/dev/ic/hme.c6
-rw-r--r--sys/dev/ic/hmevar.h6
-rw-r--r--sys/dev/ic/i82557.c6
-rw-r--r--sys/dev/ic/i82557var.h3
-rw-r--r--sys/dev/ic/lan9118.c6
-rw-r--r--sys/dev/ic/lan9118var.h4
-rw-r--r--sys/dev/ic/lance.c6
-rw-r--r--sys/dev/ic/lancevar.h4
-rw-r--r--sys/dev/ic/ld_aac.c5
-rw-r--r--sys/dev/ic/ld_cac.c5
-rw-r--r--sys/dev/ic/ld_icp.c5
-rw-r--r--sys/dev/ic/ld_mlx.c5
-rw-r--r--sys/dev/ic/lemac.c6
-rw-r--r--sys/dev/ic/lemacvar.h5
-rw-r--r--sys/dev/ic/mb86950.c6
-rw-r--r--sys/dev/ic/mb86960.c6
-rw-r--r--sys/dev/ic/mb86960var.h4
-rw-r--r--sys/dev/ic/mtd803var.h4
-rw-r--r--sys/dev/ic/pckbc.c6
-rw-r--r--sys/dev/ic/pckbcvar.h6
-rw-r--r--sys/dev/ic/rtl8169.c6
-rw-r--r--sys/dev/ic/rtl81x9.c6
-rw-r--r--sys/dev/ic/rtl81x9var.h4
-rw-r--r--sys/dev/ic/seeq8005.c6
-rw-r--r--sys/dev/ic/seeq8005var.h4
-rw-r--r--sys/dev/ic/smc91cxx.c6
-rw-r--r--sys/dev/ic/smc91cxxvar.h4
-rw-r--r--sys/dev/ic/tulipvar.h4
-rw-r--r--sys/dev/isa/cs89x0isa.c6
-rw-r--r--sys/dev/isa/fd.c6
-rw-r--r--sys/dev/isa/fdc_isa.c5
-rw-r--r--sys/dev/isa/fdvar.h4
-rw-r--r--sys/dev/isa/if_cs_isa.c6
-rw-r--r--sys/dev/isa/if_eg.c6
-rw-r--r--sys/dev/isa/if_el.c6
-rw-r--r--sys/dev/isa/if_iy.c6
-rw-r--r--sys/dev/isa/if_tscs_isa.c6
-rw-r--r--sys/dev/isapnp/if_cs_isapnp.c6
-rw-r--r--sys/dev/iscsi/iscsi_globals.h3
-rw-r--r--sys/dev/iscsi/iscsi_test.c4
-rw-r--r--sys/dev/ld.c6
-rw-r--r--sys/dev/ldvar.h4
-rw-r--r--sys/dev/marvell/if_gfe.c6
-rw-r--r--sys/dev/marvell/if_mvgbe.c6
-rw-r--r--sys/dev/mca/ed_mca.c6
-rw-r--r--sys/dev/mca/edc_mca.c6
-rw-r--r--sys/dev/mca/if_tra_mca.c5
-rw-r--r--sys/dev/ofisa/if_cs_ofisa.c6
-rw-r--r--sys/dev/pci/amdpm.c7
-rw-r--r--sys/dev/pci/amdpm_smbus.c5
-rw-r--r--sys/dev/pci/amdpmvar.h3
-rw-r--r--sys/dev/pci/auich.c6
-rw-r--r--sys/dev/pci/hifn7751.c7
-rw-r--r--sys/dev/pci/if_age.c6
-rw-r--r--sys/dev/pci/if_alc.c2
-rw-r--r--sys/dev/pci/if_ale.c6
-rw-r--r--sys/dev/pci/if_bce.c6
-rw-r--r--sys/dev/pci/if_bge.c6
-rw-r--r--sys/dev/pci/if_cas.c6
-rw-r--r--sys/dev/pci/if_de.c6
-rw-r--r--sys/dev/pci/if_devar.h4
-rw-r--r--sys/dev/pci/if_dge.c6
-rw-r--r--sys/dev/pci/if_fxp_pci.c6
-rw-r--r--sys/dev/pci/if_jme.c6
-rw-r--r--sys/dev/pci/if_msk.c6
-rw-r--r--sys/dev/pci/if_mskvar.h4
-rw-r--r--sys/dev/pci/if_pcn.c6
-rw-r--r--sys/dev/pci/if_sip.c6
-rw-r--r--sys/dev/pci/if_sk.c6
-rw-r--r--sys/dev/pci/if_skvar.h4
-rw-r--r--sys/dev/pci/if_tl.c6
-rw-r--r--sys/dev/pci/if_tlvar.h4
-rw-r--r--sys/dev/pci/if_vr.c6
-rw-r--r--sys/dev/pci/if_vte.c6
-rw-r--r--sys/dev/pci/if_wm.c6
-rw-r--r--sys/dev/pci/if_xge.c6
-rw-r--r--sys/dev/pci/ld_amr.c5
-rw-r--r--sys/dev/pci/ld_twa.c5
-rw-r--r--sys/dev/pci/ld_twe.c5
-rw-r--r--sys/dev/pci/ld_virtio.c5
-rw-r--r--sys/dev/pci/n8/common/config.c3
-rw-r--r--sys/dev/pci/n8/nsp.c1
-rw-r--r--sys/dev/pci/viornd.c4
-rw-r--r--sys/dev/pcmcia/if_cs_pcmcia.c6
-rw-r--r--sys/dev/pcmcia/if_xivar.h4
-rw-r--r--sys/dev/sbus/be.c5
-rw-r--r--sys/dev/sbus/qe.c5
-rw-r--r--sys/dev/scsipi/cd.c6
-rw-r--r--sys/dev/scsipi/sd.c7
-rw-r--r--sys/dev/scsipi/sdvar.h4
-rw-r--r--sys/dev/scsipi/stvar.h4
-rw-r--r--sys/dev/sdmmc/ld_sdmmc.c6
-rw-r--r--sys/dev/sysmon/sysmon_envsys.c6
-rw-r--r--sys/dev/sysmon/sysmon_power.c6
-rw-r--r--sys/dev/sysmon/sysmonvar.h4
-rw-r--r--sys/dev/usb/if_aue.c6
-rw-r--r--sys/dev/usb/if_axe.c6
-rw-r--r--sys/dev/usb/if_axen.c6
-rw-r--r--sys/dev/usb/if_cdce.c6
-rw-r--r--sys/dev/usb/if_cue.c6
-rw-r--r--sys/dev/usb/if_kue.c6
-rw-r--r--sys/dev/usb/if_smsc.c4
-rw-r--r--sys/dev/usb/if_udav.c6
-rw-r--r--sys/dev/usb/if_upl.c6
-rw-r--r--sys/dev/usb/if_url.c6
-rw-r--r--sys/dev/usb/ucom.c6
-rw-r--r--sys/dev/usb/uhidev.c5
-rw-r--r--sys/dev/usb/uhidev.h4
130 files changed, 320 insertions, 370 deletions
diff --git a/sys/dev/acpi/fdc_acpi.c b/sys/dev/acpi/fdc_acpi.c
index b5a72191a9f..d21b74240e5 100644
--- a/sys/dev/acpi/fdc_acpi.c
+++ b/sys/dev/acpi/fdc_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_acpi.c,v 1.42 2012/02/02 19:43:02 tls Exp $ */
+/* $NetBSD: fdc_acpi.c,v 1.43 2015/04/13 16:33:23 riastradh Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -31,15 +31,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.42 2012/02/02 19:43:02 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.43 2015/04/13 16:33:23 riastradh Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/disk.h>
#include <sys/systm.h>
-#include <sys/rnd.h>
-
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
diff --git a/sys/dev/ata/ld_ataraid.c b/sys/dev/ata/ld_ataraid.c
index 3447f385d11..a2fff4c6b82 100644
--- a/sys/dev/ata/ld_ataraid.c
+++ b/sys/dev/ata/ld_ataraid.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_ataraid.c,v 1.39 2012/02/02 19:43:02 tls Exp $ */
+/* $NetBSD: ld_ataraid.c,v 1.40 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.39 2012/02/02 19:43:02 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.40 2015/04/13 16:33:24 riastradh Exp $");
#include "bio.h"
@@ -66,7 +66,6 @@ __KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.39 2012/02/02 19:43:02 tls Exp $");
#include <sys/malloc.h>
#include <sys/vnode.h>
#include <sys/kauth.h>
-#include <sys/rnd.h>
#if NBIO > 0
#include <dev/ata/atavar.h>
#include <dev/ata/atareg.h>
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 7c11ad65a63..07e16f00042 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.418 2015/01/02 19:42:06 christos Exp $ */
+/* $NetBSD: wd.c,v 1.419 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.418 2015/01/02 19:42:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.419 2015/04/13 16:33:24 riastradh Exp $");
#include "opt_ata.h"
@@ -76,7 +76,7 @@ __KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.418 2015/01/02 19:42:06 christos Exp $");
#include <sys/proc.h>
#include <sys/reboot.h>
#include <sys/vnode.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <sys/intr.h>
#include <sys/bus.h>
diff --git a/sys/dev/ata/wdvar.h b/sys/dev/ata/wdvar.h
index bee1283cf97..bd1ff5a765e 100644
--- a/sys/dev/ata/wdvar.h
+++ b/sys/dev/ata/wdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wdvar.h,v 1.41 2014/09/10 07:04:48 matt Exp $ */
+/* $NetBSD: wdvar.h,v 1.42 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -31,7 +31,7 @@
#include "opt_wd_softbadsect.h"
#endif
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
struct wd_softc {
/* General disk infos */
diff --git a/sys/dev/cardbus/if_fxp_cardbus.c b/sys/dev/cardbus/if_fxp_cardbus.c
index fac70a3cf3a..1221c0aa763 100644
--- a/sys/dev/cardbus/if_fxp_cardbus.c
+++ b/sys/dev/cardbus/if_fxp_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fxp_cardbus.c,v 1.50 2012/02/02 19:43:02 tls Exp $ */
+/* $NetBSD: if_fxp_cardbus.c,v 1.51 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.50 2012/02/02 19:43:02 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.51 2015/04/13 16:33:24 riastradh Exp $");
#include "opt_inet.h"
@@ -48,8 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.50 2012/02/02 19:43:02 tls Exp
#include <sys/errno.h>
#include <sys/device.h>
-#include <sys/rnd.h>
-
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_media.h>
diff --git a/sys/dev/cardbus/if_rtk_cardbus.c b/sys/dev/cardbus/if_rtk_cardbus.c
index 0ec5b65f4c7..60de9b77dfd 100644
--- a/sys/dev/cardbus/if_rtk_cardbus.c
+++ b/sys/dev/cardbus/if_rtk_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtk_cardbus.c,v 1.47 2012/02/02 19:43:02 tls Exp $ */
+/* $NetBSD: if_rtk_cardbus.c,v 1.48 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 2000 Masanori Kanaoka
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.47 2012/02/02 19:43:02 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.48 2015/04/13 16:33:24 riastradh Exp $");
#include "opt_inet.h"
@@ -60,8 +60,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.47 2012/02/02 19:43:02 tls Exp
#include <netinet/if_inarp.h>
#endif
-#include <sys/rnd.h>
-
#include <sys/bus.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/cardbus/rbus_ppb.c b/sys/dev/cardbus/rbus_ppb.c
index 16e97832b49..a8cedaa07a4 100644
--- a/sys/dev/cardbus/rbus_ppb.c
+++ b/sys/dev/cardbus/rbus_ppb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rbus_ppb.c,v 1.43 2014/10/17 20:52:00 uebayasi Exp $ */
+/* $NetBSD: rbus_ppb.c,v 1.44 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.43 2014/10/17 20:52:00 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.44 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,8 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.43 2014/10/17 20:52:00 uebayasi Exp $
#include <sys/device.h>
#include <sys/kmem.h>
-#include <sys/rnd.h>
-
#include <machine/endian.h>
#include <sys/bus.h>
diff --git a/sys/dev/gpib/rd.c b/sys/dev/gpib/rd.c
index 3647210855d..de4486d6b16 100644
--- a/sys/dev/gpib/rd.c
+++ b/sys/dev/gpib/rd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rd.c,v 1.39 2015/01/02 19:42:06 christos Exp $ */
+/* $NetBSD: rd.c,v 1.40 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.39 2015/01/02 19:42:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.40 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -89,7 +89,7 @@ __KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.39 2015/01/02 19:42:06 christos Exp $");
#include <sys/proc.h>
#include <sys/stat.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <dev/gpib/gpibvar.h>
#include <dev/gpib/cs80busvar.h>
diff --git a/sys/dev/i2o/ld_iop.c b/sys/dev/i2o/ld_iop.c
index 21df9ad61f9..069210a3705 100644
--- a/sys/dev/i2o/ld_iop.c
+++ b/sys/dev/i2o/ld_iop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_iop.c,v 1.34 2012/02/02 19:43:02 tls Exp $ */
+/* $NetBSD: ld_iop.c,v 1.35 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_iop.c,v 1.34 2012/02/02 19:43:02 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_iop.c,v 1.35 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: ld_iop.c,v 1.34 2012/02/02 19:43:02 tls Exp $");
#include <sys/dkio.h>
#include <sys/disk.h>
#include <sys/proc.h>
-#include <sys/rnd.h>
#include <sys/bus.h>
diff --git a/sys/dev/ic/am7990.c b/sys/dev/ic/am7990.c
index 0142fef78b5..a35a36794b2 100644
--- a/sys/dev/ic/am7990.c
+++ b/sys/dev/ic/am7990.c
@@ -1,4 +1,4 @@
-/* $NetBSD: am7990.c,v 1.74 2012/02/02 19:43:02 tls Exp $ */
+/* $NetBSD: am7990.c,v 1.75 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am7990.c,v 1.74 2012/02/02 19:43:02 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am7990.c,v 1.75 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,7 +76,7 @@ __KERNEL_RCSID(0, "$NetBSD: am7990.c,v 1.74 2012/02/02 19:43:02 tls Exp $");
#include <sys/malloc.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/ic/am79900.c b/sys/dev/ic/am79900.c
index ae9646a7314..01df313a148 100644
--- a/sys/dev/ic/am79900.c
+++ b/sys/dev/ic/am79900.c
@@ -1,4 +1,4 @@
-/* $NetBSD: am79900.c,v 1.23 2012/02/02 19:43:02 tls Exp $ */
+/* $NetBSD: am79900.c,v 1.24 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -103,7 +103,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am79900.c,v 1.23 2012/02/02 19:43:02 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am79900.c,v 1.24 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -114,7 +114,7 @@ __KERNEL_RCSID(0, "$NetBSD: am79900.c,v 1.23 2012/02/02 19:43:02 tls Exp $");
#include <sys/malloc.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index 4717198d512..353d742d601 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.332 2015/03/07 22:13:16 skrll Exp $ */
+/* $NetBSD: com.c,v 1.333 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.332 2015/03/07 22:13:16 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.333 2015/04/13 16:33:24 riastradh Exp $");
#include "opt_com.h"
#include "opt_ddb.h"
@@ -75,8 +75,6 @@ __KERNEL_RCSID(0, "$NetBSD: com.c,v 1.332 2015/03/07 22:13:16 skrll Exp $");
#include "opt_multiprocessor.h"
#include "opt_ntp.h"
-#include "rnd.h"
-
/* The COM16650 option was renamed to COM_16650. */
#ifdef COM16650
#error Obsolete COM16650 option; use COM_16650 instead.
@@ -114,7 +112,7 @@ __KERNEL_RCSID(0, "$NetBSD: com.c,v 1.332 2015/03/07 22:13:16 skrll Exp $");
#include <sys/kauth.h>
#include <sys/intr.h>
#ifdef RND_COM
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#endif
diff --git a/sys/dev/ic/comvar.h b/sys/dev/ic/comvar.h
index 6dd50610295..a28b285c382 100644
--- a/sys/dev/ic/comvar.h
+++ b/sys/dev/ic/comvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: comvar.h,v 1.79 2014/11/22 15:14:35 macallan Exp $ */
+/* $NetBSD: comvar.h,v 1.80 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -30,14 +30,13 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "rnd.h"
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
#include "opt_com.h"
#include "opt_kgdb.h"
#ifdef RND_COM
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#endif
#include <sys/callout.h>
diff --git a/sys/dev/ic/cs89x0.c b/sys/dev/ic/cs89x0.c
index abb0efd315b..1e7576f7188 100644
--- a/sys/dev/ic/cs89x0.c
+++ b/sys/dev/ic/cs89x0.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs89x0.c,v 1.34 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: cs89x0.c,v 1.35 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 2004 Christopher Gilbert
@@ -212,7 +212,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs89x0.c,v 1.34 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs89x0.c,v 1.35 2015/04/13 16:33:24 riastradh Exp $");
#include "opt_inet.h"
@@ -226,7 +226,7 @@ __KERNEL_RCSID(0, "$NetBSD: cs89x0.c,v 1.34 2014/08/10 16:44:35 tls Exp $");
#include <sys/ioctl.h>
#include <sys/errno.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_ether.h>
diff --git a/sys/dev/ic/cs89x0var.h b/sys/dev/ic/cs89x0var.h
index 9453d7ea6ea..249f6608793 100644
--- a/sys/dev/ic/cs89x0var.h
+++ b/sys/dev/ic/cs89x0var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cs89x0var.h,v 1.16 2012/02/02 19:43:03 tls Exp $ */
+/* $NetBSD: cs89x0var.h,v 1.17 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright 1997
@@ -57,6 +57,8 @@
#ifndef _DEV_IC_CS89X0VAR_H_
#define _DEV_IC_CS89X0VAR_H_
+#include <sys/rndsource.h>
+
/*
* Ethernet software status per interface.
*
diff --git a/sys/dev/ic/dp8390.c b/sys/dev/ic/dp8390.c
index 48eb263c85a..e8a1126da91 100644
--- a/sys/dev/ic/dp8390.c
+++ b/sys/dev/ic/dp8390.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dp8390.c,v 1.81 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: dp8390.c,v 1.82 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@@ -14,7 +14,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.81 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.82 2015/04/13 16:33:24 riastradh Exp $");
#include "opt_ipkdb.h"
#include "opt_inet.h"
@@ -28,7 +28,7 @@ __KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.81 2014/08/10 16:44:35 tls Exp $");
#include <sys/socket.h>
#include <sys/syslog.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/ic/dp8390var.h b/sys/dev/ic/dp8390var.h
index 635e2ecb4d1..adabcef8972 100644
--- a/sys/dev/ic/dp8390var.h
+++ b/sys/dev/ic/dp8390var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dp8390var.h,v 1.32 2012/02/02 19:43:03 tls Exp $ */
+/* $NetBSD: dp8390var.h,v 1.33 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@@ -13,7 +13,7 @@
* the author assume any responsibility for damages incurred with its use.
*/
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
/*
* We include MII glue here -- some DP8390 compatible chips have
diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c
index 7042ca9dc37..c8a2194c17d 100644
--- a/sys/dev/ic/elink3.c
+++ b/sys/dev/ic/elink3.c
@@ -1,4 +1,4 @@
-/* $NetBSD: elink3.c,v 1.135 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: elink3.c,v 1.136 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.135 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.136 2015/04/13 16:33:24 riastradh Exp $");
#include "opt_inet.h"
@@ -77,7 +77,7 @@ __KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.135 2014/08/10 16:44:35 tls Exp $");
#include <sys/syslog.h>
#include <sys/select.h>
#include <sys/device.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/ic/elink3var.h b/sys/dev/ic/elink3var.h
index 30711686d4b..30b1f5cb7e8 100644
--- a/sys/dev/ic/elink3var.h
+++ b/sys/dev/ic/elink3var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: elink3var.h,v 1.38 2012/02/02 19:43:03 tls Exp $ */
+/* $NetBSD: elink3var.h,v 1.39 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 1994 Herb Peyerl <hpeyerl@beer.org>
@@ -30,7 +30,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
/*
* Ethernet software status per interface.
diff --git a/sys/dev/ic/elinkxl.c b/sys/dev/ic/elinkxl.c
index b06ac79158a..9dd2d0b44da 100644
--- a/sys/dev/ic/elinkxl.c
+++ b/sys/dev/ic/elinkxl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: elinkxl.c,v 1.116 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: elinkxl.c,v 1.117 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.116 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.117 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.116 2014/08/10 16:44:35 tls Exp $");
#include <sys/syslog.h>
#include <sys/select.h>
#include <sys/device.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/ic/elinkxlvar.h b/sys/dev/ic/elinkxlvar.h
index b2f01c842cf..20bf28603cf 100644
--- a/sys/dev/ic/elinkxlvar.h
+++ b/sys/dev/ic/elinkxlvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: elinkxlvar.h,v 1.24 2012/02/02 19:43:03 tls Exp $ */
+/* $NetBSD: elinkxlvar.h,v 1.25 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
/*
* Ethernet software status per interface.
diff --git a/sys/dev/ic/gemvar.h b/sys/dev/ic/gemvar.h
index 59e6cb57b71..bc73069c192 100644
--- a/sys/dev/ic/gemvar.h
+++ b/sys/dev/ic/gemvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gemvar.h,v 1.24 2012/07/02 11:23:40 jdc Exp $ */
+/* $NetBSD: gemvar.h,v 1.25 2015/04/13 16:33:24 riastradh Exp $ */
/*
*
@@ -36,7 +36,7 @@
#include <sys/queue.h>
#include <sys/callout.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
/*
* Misc. definitions for the Sun ``Gem'' Ethernet controller family driver.
diff --git a/sys/dev/ic/hme.c b/sys/dev/ic/hme.c
index 6d5ca7ab741..cac26524ea3 100644
--- a/sys/dev/ic/hme.c
+++ b/sys/dev/ic/hme.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hme.c,v 1.90 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: hme.c,v 1.91 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.90 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.91 2015/04/13 16:33:24 riastradh Exp $");
/* #define HMEDEBUG */
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.90 2014/08/10 16:44:35 tls Exp $");
#include <sys/malloc.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/ic/hmevar.h b/sys/dev/ic/hmevar.h
index cc83fa08d4f..5025d566b83 100644
--- a/sys/dev/ic/hmevar.h
+++ b/sys/dev/ic/hmevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hmevar.h,v 1.23 2012/02/02 19:43:03 tls Exp $ */
+/* $NetBSD: hmevar.h,v 1.24 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -29,10 +29,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-
#include <sys/callout.h>
-#include <sys/rnd.h>
-
+#include <sys/rndsource.h>
struct hme_ring {
/* Ring Descriptors */
diff --git a/sys/dev/ic/i82557.c b/sys/dev/ic/i82557.c
index 2e73da81f0c..cb8bdefb101 100644
--- a/sys/dev/ic/i82557.c
+++ b/sys/dev/ic/i82557.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82557.c,v 1.142 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: i82557.c,v 1.143 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.142 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.143 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,7 +83,7 @@ __KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.142 2014/08/10 16:44:35 tls Exp $");
#include <machine/endian.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/ic/i82557var.h b/sys/dev/ic/i82557var.h
index 040840c57ba..5d746a24228 100644
--- a/sys/dev/ic/i82557var.h
+++ b/sys/dev/ic/i82557var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i82557var.h,v 1.51 2014/11/22 19:50:00 joerg Exp $ */
+/* $NetBSD: i82557var.h,v 1.52 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2001 The NetBSD Foundation, Inc.
@@ -60,6 +60,7 @@
*/
#include <sys/callout.h>
+#include <sys/rndsource.h>
/*
* Misc. definitions for the Intel i82557 fast Ethernet controller
diff --git a/sys/dev/ic/lan9118.c b/sys/dev/ic/lan9118.c
index 871ce1b7678..62347d248f1 100644
--- a/sys/dev/ic/lan9118.c
+++ b/sys/dev/ic/lan9118.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lan9118.c,v 1.18 2015/02/09 07:53:39 slp Exp $ */
+/* $NetBSD: lan9118.c,v 1.19 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lan9118.c,v 1.18 2015/02/09 07:53:39 slp Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lan9118.c,v 1.19 2015/04/13 16:33:24 riastradh Exp $");
/*
* The LAN9118 Family
@@ -65,7 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: lan9118.c,v 1.18 2015/02/09 07:53:39 slp Exp $");
#include <dev/mii/miivar.h>
#include <net/bpf.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <dev/ic/lan9118reg.h>
#include <dev/ic/lan9118var.h>
diff --git a/sys/dev/ic/lan9118var.h b/sys/dev/ic/lan9118var.h
index 1cdc5fdd72b..a441c27c142 100644
--- a/sys/dev/ic/lan9118var.h
+++ b/sys/dev/ic/lan9118var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lan9118var.h,v 1.4 2012/02/02 19:43:03 tls Exp $ */
+/* $NetBSD: lan9118var.h,v 1.5 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -28,7 +28,7 @@
#ifndef _LAN9118VAR_H_
#define _LAN9118VAR_H_
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#define LAN9118_DEFAULT_TX_FIF_SZ 5 /*kB*/
diff --git a/sys/dev/ic/lance.c b/sys/dev/ic/lance.c
index cbd764e8a63..ee015f17c0f 100644
--- a/sys/dev/ic/lance.c
+++ b/sys/dev/ic/lance.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lance.c,v 1.47 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: lance.c,v 1.48 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.47 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.48 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,7 +76,7 @@ __KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.47 2014/08/10 16:44:35 tls Exp $");
#include <sys/malloc.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/ic/lancevar.h b/sys/dev/ic/lancevar.h
index 11d4b3a7225..c10b8d5ae84 100644
--- a/sys/dev/ic/lancevar.h
+++ b/sys/dev/ic/lancevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lancevar.h,v 1.15 2012/02/02 19:43:03 tls Exp $ */
+/* $NetBSD: lancevar.h,v 1.16 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
struct lance_softc {
device_t sc_dev; /* base device glue */
diff --git a/sys/dev/ic/ld_aac.c b/sys/dev/ic/ld_aac.c
index 7644a3c7408..434451705a0 100644
--- a/sys/dev/ic/ld_aac.c
+++ b/sys/dev/ic/ld_aac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_aac.c,v 1.27 2012/10/27 17:18:21 chs Exp $ */
+/* $NetBSD: ld_aac.c,v 1.28 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_aac.c,v 1.27 2012/10/27 17:18:21 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_aac.c,v 1.28 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,7 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: ld_aac.c,v 1.27 2012/10/27 17:18:21 chs Exp $");
#include <sys/endian.h>
#include <sys/dkio.h>
#include <sys/disk.h>
-#include <sys/rnd.h>
#include <sys/bus.h>
diff --git a/sys/dev/ic/ld_cac.c b/sys/dev/ic/ld_cac.c
index 83adeedc40c..84333c985af 100644
--- a/sys/dev/ic/ld_cac.c
+++ b/sys/dev/ic/ld_cac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_cac.c,v 1.27 2012/02/24 18:04:51 mhitch Exp $ */
+/* $NetBSD: ld_cac.c,v 1.28 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 2000, 2006 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_cac.c,v 1.27 2012/02/24 18:04:51 mhitch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_cac.c,v 1.28 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: ld_cac.c,v 1.27 2012/02/24 18:04:51 mhitch Exp $");
#include <sys/endian.h>
#include <sys/dkio.h>
#include <sys/disk.h>
-#include <sys/rnd.h>
#include <sys/bus.h>
diff --git a/sys/dev/ic/ld_icp.c b/sys/dev/ic/ld_icp.c
index 01f02774f29..095842bf0c6 100644
--- a/sys/dev/ic/ld_icp.c
+++ b/sys/dev/ic/ld_icp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_icp.c,v 1.26 2012/10/27 17:18:21 chs Exp $ */
+/* $NetBSD: ld_icp.c,v 1.27 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_icp.c,v 1.26 2012/10/27 17:18:21 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_icp.c,v 1.27 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: ld_icp.c,v 1.26 2012/10/27 17:18:21 chs Exp $");
#include <sys/endian.h>
#include <sys/dkio.h>
#include <sys/disk.h>
-#include <sys/rnd.h>
#include <sys/bus.h>
diff --git a/sys/dev/ic/ld_mlx.c b/sys/dev/ic/ld_mlx.c
index 51e16806e15..fc6395578ba 100644
--- a/sys/dev/ic/ld_mlx.c
+++ b/sys/dev/ic/ld_mlx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_mlx.c,v 1.20 2012/02/02 19:43:03 tls Exp $ */
+/* $NetBSD: ld_mlx.c,v 1.21 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_mlx.c,v 1.20 2012/02/02 19:43:03 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_mlx.c,v 1.21 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: ld_mlx.c,v 1.20 2012/02/02 19:43:03 tls Exp $");
#include <sys/endian.h>
#include <sys/dkio.h>
#include <sys/disk.h>
-#include <sys/rnd.h>
#include <machine/vmparam.h>
#include <sys/bus.h>
diff --git a/sys/dev/ic/lemac.c b/sys/dev/ic/lemac.c
index 3059d45ae43..d419963cd0a 100644
--- a/sys/dev/ic/lemac.c
+++ b/sys/dev/ic/lemac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lemac.c,v 1.42 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: lemac.c,v 1.43 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 1994, 1995, 1997 Matt Thomas <matt@3am-software.com>
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lemac.c,v 1.42 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lemac.c,v 1.43 2015/04/13 16:33:24 riastradh Exp $");
#include "opt_inet.h"
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: lemac.c,v 1.42 2014/08/10 16:44:35 tls Exp $");
#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/device.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_types.h>
diff --git a/sys/dev/ic/lemacvar.h b/sys/dev/ic/lemacvar.h
index 591e58309b3..59b75d59320 100644
--- a/sys/dev/ic/lemacvar.h
+++ b/sys/dev/ic/lemacvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lemacvar.h,v 1.12 2012/10/27 17:18:21 chs Exp $ */
+/* $NetBSD: lemacvar.h,v 1.13 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 1997 Matt Thomas <matt@3am-software.com>
@@ -27,8 +27,7 @@
#ifndef _LEMAC_VAR_H
#define _LEMAC_VAR_H
-
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
/*
* Ethernet status, per interface.
diff --git a/sys/dev/ic/mb86950.c b/sys/dev/ic/mb86950.c
index 8434497c5bf..67381904b9e 100644
--- a/sys/dev/ic/mb86950.c
+++ b/sys/dev/ic/mb86950.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86950.c,v 1.21 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: mb86950.c,v 1.22 2015/04/13 16:33:24 riastradh Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb86950.c,v 1.21 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb86950.c,v 1.22 2015/04/13 16:33:24 riastradh Exp $");
/*
* Device driver for Fujitsu mb86950 based Ethernet cards.
@@ -129,7 +129,7 @@ __KERNEL_RCSID(0, "$NetBSD: mb86950.c,v 1.21 2014/08/10 16:44:35 tls Exp $");
#include <sys/socket.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/ic/mb86960.c b/sys/dev/ic/mb86960.c
index dc33fdf455d..327591df1c8 100644
--- a/sys/dev/ic/mb86960.c
+++ b/sys/dev/ic/mb86960.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86960.c,v 1.80 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: mb86960.c,v 1.81 2015/04/13 16:33:24 riastradh Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb86960.c,v 1.80 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb86960.c,v 1.81 2015/04/13 16:33:24 riastradh Exp $");
/*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: mb86960.c,v 1.80 2014/08/10 16:44:35 tls Exp $");
#include <sys/socket.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/ic/mb86960var.h b/sys/dev/ic/mb86960var.h
index fde21286b1f..444ac4f7baa 100644
--- a/sys/dev/ic/mb86960var.h
+++ b/sys/dev/ic/mb86960var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86960var.h,v 1.39 2012/02/02 19:43:03 tls Exp $ */
+/* $NetBSD: mb86960var.h,v 1.40 2015/04/13 16:33:24 riastradh Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -44,7 +44,7 @@
* they are useful.
*/
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
/*
* Default settings for fe driver specific options.
diff --git a/sys/dev/ic/mtd803var.h b/sys/dev/ic/mtd803var.h
index fad9812058a..0541c10c33d 100644
--- a/sys/dev/ic/mtd803var.h
+++ b/sys/dev/ic/mtd803var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mtd803var.h,v 1.9 2012/10/27 17:18:22 chs Exp $ */
+/* $NetBSD: mtd803var.h,v 1.10 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/device.h>
#include <sys/socket.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_ether.h>
#include <net/if_media.h>
diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c
index 876176006ad..c3b071d6296 100644
--- a/sys/dev/ic/pckbc.c
+++ b/sys/dev/ic/pckbc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc.c,v 1.57 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: pckbc.c,v 1.58 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 2004 Ben Harris.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.57 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.58 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.57 2014/08/10 16:44:35 tls Exp $");
#include "locators.h"
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
/* data per slave device */
struct pckbc_slotdata {
diff --git a/sys/dev/ic/pckbcvar.h b/sys/dev/ic/pckbcvar.h
index 661e74ce845..e779e9c8918 100644
--- a/sys/dev/ic/pckbcvar.h
+++ b/sys/dev/ic/pckbcvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbcvar.h,v 1.20 2012/10/13 18:14:09 jdc Exp $ */
+/* $NetBSD: pckbcvar.h,v 1.21 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 1998
@@ -34,10 +34,6 @@
#include <dev/pckbport/pckbportvar.h>
-
-
-#include <sys/rnd.h>
-
typedef void *pckbc_tag_t;
typedef int pckbc_slot_t;
#define PCKBC_KBD_SLOT 0
diff --git a/sys/dev/ic/rtl8169.c b/sys/dev/ic/rtl8169.c
index ae269168b98..9c4b414d637 100644
--- a/sys/dev/ic/rtl8169.c
+++ b/sys/dev/ic/rtl8169.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl8169.c,v 1.143 2014/11/22 00:17:07 joerg Exp $ */
+/* $NetBSD: rtl8169.c,v 1.144 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.143 2014/11/22 00:17:07 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.144 2015/04/13 16:33:24 riastradh Exp $");
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */
/*
@@ -134,7 +134,7 @@ __KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.143 2014/11/22 00:17:07 joerg Exp $");
#include <netinet/ip.h> /* XXX for IP_MAXPACKET */
#include <net/bpf.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <sys/bus.h>
diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c
index ee23f579027..d5b532bea17 100644
--- a/sys/dev/ic/rtl81x9.c
+++ b/sys/dev/ic/rtl81x9.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl81x9.c,v 1.95 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: rtl81x9.c,v 1.96 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.95 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.96 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
@@ -106,7 +106,7 @@ __KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.95 2014/08/10 16:44:35 tls Exp $");
#include <net/if_media.h>
#include <net/bpf.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <sys/bus.h>
#include <machine/endian.h>
diff --git a/sys/dev/ic/rtl81x9var.h b/sys/dev/ic/rtl81x9var.h
index 1cf135b0cb8..debcfebd02d 100644
--- a/sys/dev/ic/rtl81x9var.h
+++ b/sys/dev/ic/rtl81x9var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl81x9var.h,v 1.54 2014/10/10 17:41:05 christos Exp $ */
+/* $NetBSD: rtl81x9var.h,v 1.55 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -34,7 +34,7 @@
* FreeBSD Id: if_rlreg.h,v 1.9 1999/06/20 18:56:09 wpaul Exp
*/
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#define RTK_ETHER_ALIGN 2
#define RTK_RXSTAT_LEN 4
diff --git a/sys/dev/ic/seeq8005.c b/sys/dev/ic/seeq8005.c
index 47d848fc121..2635f9b93fc 100644
--- a/sys/dev/ic/seeq8005.c
+++ b/sys/dev/ic/seeq8005.c
@@ -1,4 +1,4 @@
-/* $NetBSD: seeq8005.c,v 1.52 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: seeq8005.c,v 1.53 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 2000, 2001 Ben Harris
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: seeq8005.c,v 1.52 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: seeq8005.c,v 1.53 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -82,7 +82,7 @@ __KERNEL_RCSID(0, "$NetBSD: seeq8005.c,v 1.52 2014/08/10 16:44:35 tls Exp $");
#include <net/bpf.h>
#include <net/bpfdesc.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <sys/bus.h>
#include <sys/intr.h>
diff --git a/sys/dev/ic/seeq8005var.h b/sys/dev/ic/seeq8005var.h
index 739605d5aef..f91c28e40ac 100644
--- a/sys/dev/ic/seeq8005var.h
+++ b/sys/dev/ic/seeq8005var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: seeq8005var.h,v 1.8 2012/10/10 22:17:44 skrll Exp $ */
+/* $NetBSD: seeq8005var.h,v 1.9 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 2000 Ben Harris
@@ -38,7 +38,7 @@
#include <net/if_media.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
/* Enumerate the possible cip variants */
enum seeq_variant {
diff --git a/sys/dev/ic/smc91cxx.c b/sys/dev/ic/smc91cxx.c
index a125b519bbf..7ce280a48bf 100644
--- a/sys/dev/ic/smc91cxx.c
+++ b/sys/dev/ic/smc91cxx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: smc91cxx.c,v 1.88 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: smc91cxx.c,v 1.89 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.88 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.89 2015/04/13 16:33:24 riastradh Exp $");
#include "opt_inet.h"
@@ -85,7 +85,7 @@ __KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.88 2014/08/10 16:44:35 tls Exp $");
#include <sys/malloc.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <sys/bus.h>
#include <sys/intr.h>
diff --git a/sys/dev/ic/smc91cxxvar.h b/sys/dev/ic/smc91cxxvar.h
index 62623120d98..7009612bf94 100644
--- a/sys/dev/ic/smc91cxxvar.h
+++ b/sys/dev/ic/smc91cxxvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: smc91cxxvar.h,v 1.19 2012/10/27 17:18:22 chs Exp $ */
+/* $NetBSD: smc91cxxvar.h,v 1.20 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
struct smc91cxx_softc {
device_t sc_dev; /* generic device glue */
diff --git a/sys/dev/ic/tulipvar.h b/sys/dev/ic/tulipvar.h
index 2cbbc2c29e6..eeb4c013ee0 100644
--- a/sys/dev/ic/tulipvar.h
+++ b/sys/dev/ic/tulipvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tulipvar.h,v 1.68 2012/07/22 14:32:58 matt Exp $ */
+/* $NetBSD: tulipvar.h,v 1.69 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include <sys/queue.h>
#include <sys/callout.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
/*
* Misc. definitions for the Digital Semiconductor ``Tulip'' (21x4x)
diff --git a/sys/dev/isa/cs89x0isa.c b/sys/dev/isa/cs89x0isa.c
index 87c9b427deb..a09ef3f81d5 100644
--- a/sys/dev/isa/cs89x0isa.c
+++ b/sys/dev/isa/cs89x0isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs89x0isa.c,v 1.16 2012/02/02 19:43:04 tls Exp $ */
+/* $NetBSD: cs89x0isa.c,v 1.17 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright 1997
@@ -36,7 +36,7 @@
/* isa DMA routines for cs89x0 */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs89x0isa.c,v 1.16 2012/02/02 19:43:04 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs89x0isa.c,v 1.17 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,8 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: cs89x0isa.c,v 1.16 2012/02/02 19:43:04 tls Exp $");
#include <sys/socket.h>
#include <sys/device.h>
-#include <sys/rnd.h>
-
#include <net/if.h>
#include <net/if_ether.h>
#include <net/if_media.h>
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index 4b7174aa6d8..231b92a892e 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.107 2015/01/02 19:42:07 christos Exp $ */
+/* $NetBSD: fd.c,v 1.108 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 1998, 2003, 2008 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.107 2015/01/02 19:42:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.108 2015/04/13 16:33:24 riastradh Exp $");
#include "opt_ddb.h"
@@ -115,7 +115,7 @@ __KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.107 2015/01/02 19:42:07 christos Exp $");
#include <sys/fdio.h>
#include <sys/conf.h>
#include <sys/vnode.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <prop/proplib.h>
diff --git a/sys/dev/isa/fdc_isa.c b/sys/dev/isa/fdc_isa.c
index 4ea2d396668..9b6c35cb41c 100644
--- a/sys/dev/isa/fdc_isa.c
+++ b/sys/dev/isa/fdc_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_isa.c,v 1.19 2012/02/02 19:43:04 tls Exp $ */
+/* $NetBSD: fdc_isa.c,v 1.20 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_isa.c,v 1.19 2012/02/02 19:43:04 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_isa.c,v 1.20 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,7 +72,6 @@ __KERNEL_RCSID(0, "$NetBSD: fdc_isa.c,v 1.19 2012/02/02 19:43:04 tls Exp $");
#include <sys/device.h>
#include <sys/buf.h>
#include <sys/queue.h>
-#include <sys/rnd.h>
#include <sys/bus.h>
#include <sys/intr.h>
diff --git a/sys/dev/isa/fdvar.h b/sys/dev/isa/fdvar.h
index 689ba1dd605..c70ce20b6bf 100644
--- a/sys/dev/isa/fdvar.h
+++ b/sys/dev/isa/fdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fdvar.h,v 1.8 2012/02/02 19:43:04 tls Exp $ */
+/* $NetBSD: fdvar.h,v 1.9 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
/*
* Floppies come in various flavors, e.g., 1.2MB vs 1.44MB; here is how
diff --git a/sys/dev/isa/if_cs_isa.c b/sys/dev/isa/if_cs_isa.c
index 566ebabd3a0..15ca2a0d8b2 100644
--- a/sys/dev/isa/if_cs_isa.c
+++ b/sys/dev/isa/if_cs_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs_isa.c,v 1.26 2012/02/02 19:43:04 tls Exp $ */
+/* $NetBSD: if_cs_isa.c,v 1.27 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright 1997
@@ -34,15 +34,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_isa.c,v 1.26 2012/02/02 19:43:04 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_isa.c,v 1.27 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/socket.h>
#include <sys/device.h>
-#include <sys/rnd.h>
-
#include <net/if.h>
#include <net/if_ether.h>
#include <net/if_media.h>
diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c
index ad9040f0f95..b1420b9e663 100644
--- a/sys/dev/isa/if_eg.c
+++ b/sys/dev/isa/if_eg.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_eg.c,v 1.87 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: if_eg.c,v 1.88 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 1993 Dean Huxley <dean@fsa.ca>
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.87 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.88 2015/04/13 16:33:24 riastradh Exp $");
#include "opt_inet.h"
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.87 2014/08/10 16:44:35 tls Exp $");
#include <sys/syslog.h>
#include <sys/select.h>
#include <sys/device.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c
index 2052d4cce48..c0f9469ec6f 100644
--- a/sys/dev/isa/if_el.c
+++ b/sys/dev/isa/if_el.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_el.c,v 1.90 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: if_el.c,v 1.91 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 1994, Matthew E. Kimmel. Permission is hereby granted
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.90 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.91 2015/04/13 16:33:24 riastradh Exp $");
#include "opt_inet.h"
@@ -31,7 +31,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.90 2014/08/10 16:44:35 tls Exp $");
#include <sys/socket.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/isa/if_iy.c b/sys/dev/isa/if_iy.c
index 54ab9c7502b..d7aa89a3e6f 100644
--- a/sys/dev/isa/if_iy.c
+++ b/sys/dev/isa/if_iy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iy.c,v 1.93 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: if_iy.c,v 1.94 2015/04/13 16:33:24 riastradh Exp $ */
/* #define IYDEBUG */
/* #define IYMEMDEBUG */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.93 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.94 2015/04/13 16:33:24 riastradh Exp $");
#include "opt_inet.h"
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.93 2014/08/10 16:44:35 tls Exp $");
#include <sys/syslog.h>
#include <sys/device.h>
#include <sys/endian.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_types.h>
diff --git a/sys/dev/isa/if_tscs_isa.c b/sys/dev/isa/if_tscs_isa.c
index 17af54f6047..7402b84afe5 100644
--- a/sys/dev/isa/if_tscs_isa.c
+++ b/sys/dev/isa/if_tscs_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tscs_isa.c,v 1.15 2012/02/02 19:43:04 tls Exp $ */
+/* $NetBSD: if_tscs_isa.c,v 1.16 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -30,15 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tscs_isa.c,v 1.15 2012/02/02 19:43:04 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tscs_isa.c,v 1.16 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/socket.h>
#include <sys/device.h>
-#include <sys/rnd.h>
-
#include <net/if.h>
#include <net/if_ether.h>
#include <net/if_media.h>
diff --git a/sys/dev/isapnp/if_cs_isapnp.c b/sys/dev/isapnp/if_cs_isapnp.c
index 83af85b539b..2a55e78439f 100644
--- a/sys/dev/isapnp/if_cs_isapnp.c
+++ b/sys/dev/isapnp/if_cs_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs_isapnp.c,v 1.18 2012/02/02 19:43:04 tls Exp $ */
+/* $NetBSD: if_cs_isapnp.c,v 1.19 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c)2001 YAMAMOTO Takashi,
@@ -27,15 +27,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_isapnp.c,v 1.18 2012/02/02 19:43:04 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_isapnp.c,v 1.19 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/socket.h>
-#include <sys/rnd.h>
-
#include <net/if.h>
#include <net/if_ether.h>
#include <net/if_media.h>
diff --git a/sys/dev/iscsi/iscsi_globals.h b/sys/dev/iscsi/iscsi_globals.h
index 66dce31fb10..de5beda650e 100644
--- a/sys/dev/iscsi/iscsi_globals.h
+++ b/sys/dev/iscsi/iscsi_globals.h
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_globals.h,v 1.6 2012/12/29 11:05:29 mlelstv Exp $ */
+/* $NetBSD: iscsi_globals.h,v 1.7 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -45,7 +45,6 @@
#include <sys/kernel.h>
#include <sys/kthread.h>
#include <sys/systm.h>
-#include <sys/rnd.h>
#include <sys/device.h>
#include <dev/scsipi/scsi_all.h>
diff --git a/sys/dev/iscsi/iscsi_test.c b/sys/dev/iscsi/iscsi_test.c
index a7a3a837e1c..91c3eac7dd6 100644
--- a/sys/dev/iscsi/iscsi_test.c
+++ b/sys/dev/iscsi/iscsi_test.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_test.c,v 1.3 2012/12/29 11:05:30 mlelstv Exp $ */
+/* $NetBSD: iscsi_test.c,v 1.4 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 2006,2011 The NetBSD Foundation, Inc.
@@ -29,6 +29,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include <sys/cprng.h>
+
#include "iscsi_globals.h"
#ifdef ISCSI_TEST_MODE
diff --git a/sys/dev/ld.c b/sys/dev/ld.c
index ab31046aa5e..a9ed266473a 100644
--- a/sys/dev/ld.c
+++ b/sys/dev/ld.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld.c,v 1.81 2015/01/02 19:42:06 christos Exp $ */
+/* $NetBSD: ld.c,v 1.82 2015/04/13 16:33:23 riastradh Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.81 2015/01/02 19:42:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.82 2015/04/13 16:33:23 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.81 2015/01/02 19:42:06 christos Exp $");
#include <sys/vnode.h>
#include <sys/syslog.h>
#include <sys/mutex.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <dev/ldvar.h>
diff --git a/sys/dev/ldvar.h b/sys/dev/ldvar.h
index 9f71ae9fcc9..acfdbd83df1 100644
--- a/sys/dev/ldvar.h
+++ b/sys/dev/ldvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ldvar.h,v 1.21 2012/05/03 21:21:08 bsh Exp $ */
+/* $NetBSD: ldvar.h,v 1.22 2015/04/13 16:33:23 riastradh Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include <sys/mutex.h>
#include <sys/device.h> /* for device_t */
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
struct ld_softc {
device_t sc_dv;
diff --git a/sys/dev/marvell/if_gfe.c b/sys/dev/marvell/if_gfe.c
index 680cb2158df..ecf7602a82e 100644
--- a/sys/dev/marvell/if_gfe.c
+++ b/sys/dev/marvell/if_gfe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gfe.c,v 1.44 2015/01/11 22:59:57 joerg Exp $ */
+/* $NetBSD: if_gfe.c,v 1.45 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.44 2015/01/11 22:59:57 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.45 2015/04/13 16:33:24 riastradh Exp $");
#include "opt_inet.h"
@@ -67,7 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.44 2015/01/11 22:59:57 joerg Exp $");
#include <netinet/if_inarp.h>
#endif
#include <net/bpf.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/marvell/if_mvgbe.c b/sys/dev/marvell/if_mvgbe.c
index d51f01964e2..79036022a4b 100644
--- a/sys/dev/marvell/if_mvgbe.c
+++ b/sys/dev/marvell/if_mvgbe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mvgbe.c,v 1.39 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: if_mvgbe.c,v 1.40 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 2007, 2008, 2013 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.39 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.40 2015/04/13 16:33:24 riastradh Exp $");
#include "opt_multiprocessor.h"
@@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.39 2014/08/10 16:44:35 tls Exp $");
#include <netinet/ip.h>
#include <net/bpf.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/mca/ed_mca.c b/sys/dev/mca/ed_mca.c
index 95696042201..e576711883f 100644
--- a/sys/dev/mca/ed_mca.c
+++ b/sys/dev/mca/ed_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ed_mca.c,v 1.62 2015/01/02 19:42:07 christos Exp $ */
+/* $NetBSD: ed_mca.c,v 1.63 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.62 2015/01/02 19:42:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.63 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.62 2015/01/02 19:42:07 christos Exp $")
#include <sys/syslog.h>
#include <sys/proc.h>
#include <sys/vnode.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <sys/intr.h>
#include <sys/bus.h>
diff --git a/sys/dev/mca/edc_mca.c b/sys/dev/mca/edc_mca.c
index ed4b416cf11..f2ff5bebade 100644
--- a/sys/dev/mca/edc_mca.c
+++ b/sys/dev/mca/edc_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: edc_mca.c,v 1.49 2014/03/20 06:48:54 skrll Exp $ */
+/* $NetBSD: edc_mca.c,v 1.50 2015/04/13 16:33:24 riastradh Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.49 2014/03/20 06:48:54 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.50 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,7 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.49 2014/03/20 06:48:54 skrll Exp $");
#include <sys/vnode.h>
#include <sys/kernel.h>
#include <sys/kthread.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <sys/bus.h>
#include <sys/intr.h>
diff --git a/sys/dev/mca/if_tra_mca.c b/sys/dev/mca/if_tra_mca.c
index 954f8a4c3b4..6d2a1db21ae 100644
--- a/sys/dev/mca/if_tra_mca.c
+++ b/sys/dev/mca/if_tra_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tra_mca.c,v 1.16 2012/10/27 17:18:26 chs Exp $ */
+/* $NetBSD: if_tra_mca.c,v 1.17 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -35,14 +35,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tra_mca.c,v 1.16 2012/10/27 17:18:26 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tra_mca.c,v 1.17 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/socket.h>
#include <sys/syslog.h>
-#include <sys/rnd.h>
#include <net/if.h>
#include <net/if_ether.h>
diff --git a/sys/dev/ofisa/if_cs_ofisa.c b/sys/dev/ofisa/if_cs_ofisa.c
index fedf421b85e..6e7ff990fea 100644
--- a/sys/dev/ofisa/if_cs_ofisa.c
+++ b/sys/dev/ofisa/if_cs_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs_ofisa.c,v 1.25 2012/02/02 19:43:04 tls Exp $ */
+/* $NetBSD: if_cs_ofisa.c,v 1.26 2015/04/13 16:33:24 riastradh Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa.c,v 1.25 2012/02/02 19:43:04 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa.c,v 1.26 2015/04/13 16:33:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa.c,v 1.25 2012/02/02 19:43:04 tls Exp $")
#include <sys/device.h>
#include <sys/malloc.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_ether.h>
diff --git a/sys/dev/pci/amdpm.c b/sys/dev/pci/amdpm.c
index 93008d20300..388da095928 100644
--- a/sys/dev/pci/amdpm.c
+++ b/sys/dev/pci/amdpm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdpm.c,v 1.38 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: amdpm.c,v 1.39 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdpm.c,v 1.38 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdpm.c,v 1.39 2015/04/13 16:33:25 riastradh Exp $");
#include "opt_amdpm.h"
@@ -39,7 +39,8 @@ __KERNEL_RCSID(0, "$NetBSD: amdpm.c,v 1.38 2014/08/10 16:44:35 tls Exp $");
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/callout.h>
-#include <sys/rnd.h>
+#include <sys/rndpool.h>
+#include <sys/rndsource.h>
#include <sys/mutex.h>
#include <sys/bus.h>
diff --git a/sys/dev/pci/amdpm_smbus.c b/sys/dev/pci/amdpm_smbus.c
index 2ce7fe397f9..aedae7dd48c 100644
--- a/sys/dev/pci/amdpm_smbus.c
+++ b/sys/dev/pci/amdpm_smbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdpm_smbus.c,v 1.20 2013/06/13 00:55:01 tls Exp $ */
+/* $NetBSD: amdpm_smbus.c,v 1.21 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 2005 Anil Gopinath (anil_public@yahoo.com)
@@ -32,13 +32,12 @@
* AMD-8111 HyperTransport I/O Hub
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdpm_smbus.c,v 1.20 2013/06/13 00:55:01 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdpm_smbus.c,v 1.21 2015/04/13 16:33:25 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <sys/rnd.h>
#include <sys/mutex.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/amdpmvar.h b/sys/dev/pci/amdpmvar.h
index 7598faf58c2..5982725ccc5 100644
--- a/sys/dev/pci/amdpmvar.h
+++ b/sys/dev/pci/amdpmvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: amdpmvar.h,v 1.10 2013/06/13 00:55:01 tls Exp $ */
+/* $NetBSD: amdpmvar.h,v 1.11 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -33,6 +33,7 @@
#define _DEV_PCI_AMDPMVAR_H_
#include <sys/mutex.h>
+#include <sys/rndsource.h>
struct amdpm_softc {
device_t sc_dev;
diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c
index c0ae9ca128c..30380911208 100644
--- a/sys/dev/pci/auich.c
+++ b/sys/dev/pci/auich.c
@@ -1,4 +1,4 @@
-/* $NetBSD: auich.c,v 1.144 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: auich.c,v 1.145 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2008 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.144 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.145 2015/04/13 16:33:25 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -123,7 +123,7 @@ __KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.144 2014/08/10 16:44:35 tls Exp $");
#include <sys/sysctl.h>
#include <sys/audioio.h>
#include <sys/bus.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/hifn7751.c b/sys/dev/pci/hifn7751.c
index b6daff0f20f..4347ca37ea5 100644
--- a/sys/dev/pci/hifn7751.c
+++ b/sys/dev/pci/hifn7751.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hifn7751.c,v 1.56 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: hifn7751.c,v 1.57 2015/04/13 16:33:25 riastradh Exp $ */
/* $FreeBSD: hifn7751.c,v 1.5.2.7 2003/10/08 23:52:00 sam Exp $ */
/* $OpenBSD: hifn7751.c,v 1.140 2003/08/01 17:55:54 deraadt Exp $ */
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.56 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.57 2015/04/13 16:33:25 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,7 +67,8 @@ __KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.56 2014/08/10 16:44:35 tls Exp $");
#else
#include <opencrypto/cryptodev.h>
#include <sys/cprng.h>
-#include <sys/rnd.h>
+#include <sys/rndpool.h>
+#include <sys/rndsource.h>
#include <sys/sha1.h>
#endif
diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c
index 3ba20a902fa..b9fa7685194 100644
--- a/sys/dev/pci/if_age.c
+++ b/sys/dev/pci/if_age.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_age.c,v 1.44 2014/03/29 19:28:24 christos Exp $ */
+/* $NetBSD: if_age.c,v 1.45 2015/04/13 16:33:25 riastradh Exp $ */
/* $OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $ */
/*-
@@ -31,7 +31,7 @@
/* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.44 2014/03/29 19:28:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.45 2015/04/13 16:33:25 riastradh Exp $");
#include "vlan.h"
@@ -65,8 +65,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.44 2014/03/29 19:28:24 christos Exp $")
#include <net/bpf.h>
-#include <sys/rnd.h>
-
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c
index e99ba6cddc7..3864ee263df 100644
--- a/sys/dev/pci/if_alc.c
+++ b/sys/dev/pci/if_alc.c
@@ -68,8 +68,6 @@
#include <net/bpf.h>
-#include <sys/rnd.h>
-
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c
index 403e7f1c062..43dc6e37c67 100644
--- a/sys/dev/pci/if_ale.c
+++ b/sys/dev/pci/if_ale.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ale.c,v 1.17 2014/03/29 19:28:24 christos Exp $ */
+/* $NetBSD: if_ale.c,v 1.18 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
@@ -32,7 +32,7 @@
/* Driver for Atheros AR8121/AR8113/AR8114 PCIe Ethernet. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.17 2014/03/29 19:28:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.18 2015/04/13 16:33:25 riastradh Exp $");
#include "vlan.h"
@@ -69,8 +69,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.17 2014/03/29 19:28:24 christos Exp $")
#include <net/bpf.h>
-#include <sys/rnd.h>
-
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_bce.c b/sys/dev/pci/if_bce.c
index 1316d1ebfc5..b127ced74be 100644
--- a/sys/dev/pci/if_bce.c
+++ b/sys/dev/pci/if_bce.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bce.c,v 1.39 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_bce.c,v 1.40 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 2003 Clifford Wright. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.39 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.40 2015/04/13 16:33:25 riastradh Exp $");
#include "vlan.h"
@@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.39 2014/08/10 16:44:36 tls Exp $");
#include <net/if_ether.h>
#include <net/bpf.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index e86f900ffc7..e78f08919b4 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.281 2015/04/06 07:38:17 martin Exp $ */
+/* $NetBSD: if_bge.c,v 1.282 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.281 2015/04/06 07:38:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.282 2015/04/13 16:33:25 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -97,7 +97,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.281 2015/04/06 07:38:17 martin Exp $");
#include <net/if_media.h>
#include <net/if_ether.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#ifdef INET
#include <netinet/in.h>
diff --git a/sys/dev/pci/if_cas.c b/sys/dev/pci/if_cas.c
index a99ebaa3916..ec4c78fe47b 100644
--- a/sys/dev/pci/if_cas.c
+++ b/sys/dev/pci/if_cas.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cas.c,v 1.22 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_cas.c,v 1.23 2015/04/13 16:33:25 riastradh Exp $ */
/* $OpenBSD: if_cas.c,v 1.29 2009/11/29 16:19:38 kettenis Exp $ */
/*
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.22 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.23 2015/04/13 16:33:25 riastradh Exp $");
#ifndef _MODULE
#include "opt_inet.h"
@@ -83,7 +83,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.22 2014/08/10 16:44:36 tls Exp $");
#include <sys/bus.h>
#include <sys/intr.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index 5d57a9b78ba..6a229b5c8f0 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_de.c,v 1.144 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_de.c,v 1.145 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -37,7 +37,7 @@
* board which support 21040, 21041, or 21140 (mostly).
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.144 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.145 2015/04/13 16:33:25 riastradh Exp $");
#define TULIP_HDR_DATA
@@ -63,7 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.144 2014/08/10 16:44:36 tls Exp $");
#endif
#if defined(__NetBSD__)
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#endif
#include <net/if.h>
diff --git a/sys/dev/pci/if_devar.h b/sys/dev/pci/if_devar.h
index 50ee65878c1..43f35b58b0c 100644
--- a/sys/dev/pci/if_devar.h
+++ b/sys/dev/pci/if_devar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_devar.h,v 1.58 2012/10/27 17:18:32 chs Exp $ */
+/* $NetBSD: if_devar.h,v 1.59 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -31,7 +31,7 @@
#if defined(__NetBSD__)
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#if NetBSD >= 199803
#define TULIP_BUS_DMA 1
diff --git a/sys/dev/pci/if_dge.c b/sys/dev/pci/if_dge.c
index bdc3c9e663f..66ef831b8eb 100644
--- a/sys/dev/pci/if_dge.c
+++ b/sys/dev/pci/if_dge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dge.c,v 1.39 2015/01/11 04:19:18 chs Exp $ */
+/* $NetBSD: if_dge.c,v 1.40 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 2004, SUNET, Swedish University Computer Network.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.39 2015/01/11 04:19:18 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.40 2015/04/13 16:33:25 riastradh Exp $");
@@ -96,7 +96,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.39 2015/01/11 04:19:18 chs Exp $");
#include <sys/device.h>
#include <sys/queue.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/pci/if_fxp_pci.c b/sys/dev/pci/if_fxp_pci.c
index 5bc29694c2a..ee6fb86dd0d 100644
--- a/sys/dev/pci/if_fxp_pci.c
+++ b/sys/dev/pci/if_fxp_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fxp_pci.c,v 1.81 2014/03/29 19:28:24 christos Exp $ */
+/* $NetBSD: if_fxp_pci.c,v 1.82 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.81 2014/03/29 19:28:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.82 2015/04/13 16:33:25 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,8 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.81 2014/03/29 19:28:24 christos Exp
#include <sys/errno.h>
#include <sys/device.h>
-#include <sys/rnd.h>
-
#include <machine/endian.h>
#include <net/if.h>
diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c
index 6144ab381e5..31796fb80b5 100644
--- a/sys/dev/pci/if_jme.c
+++ b/sys/dev/pci/if_jme.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_jme.c,v 1.26 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_jme.c,v 1.27 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 2008 Manuel Bouyer. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.26 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.27 2015/04/13 16:33:25 riastradh Exp $");
#include <sys/param.h>
@@ -87,7 +87,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.26 2014/08/10 16:44:36 tls Exp $");
#include <net/bpf.h>
#include <net/bpfdesc.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c
index 858bac1286f..92e4d769c2e 100644
--- a/sys/dev/pci/if_msk.c
+++ b/sys/dev/pci/if_msk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.47 2014/10/10 14:23:06 christos Exp $ */
+/* $NetBSD: if_msk.c,v 1.48 2015/04/13 16:33:25 riastradh Exp $ */
/* $OpenBSD: if_msk.c,v 1.42 2007/01/17 02:43:02 krw Exp $ */
/*
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.47 2014/10/10 14:23:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.48 2015/04/13 16:33:25 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -79,7 +79,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.47 2014/10/10 14:23:06 christos Exp $")
#include <net/if_media.h>
#include <net/bpf.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_mskvar.h b/sys/dev/pci/if_mskvar.h
index 07ab56b8291..23cb2e5548a 100644
--- a/sys/dev/pci/if_mskvar.h
+++ b/sys/dev/pci/if_mskvar.h
@@ -1,5 +1,5 @@
/* $OpenBSD: if_mskvar.h,v 1.3 2006/12/28 16:34:42 kettenis Exp $ */
-/* $NetBSD: if_mskvar.h,v 1.11 2012/10/14 19:10:41 msaitoh Exp $ */
+/* $NetBSD: if_mskvar.h,v 1.12 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
#ifndef _DEV_PCI_IF_MSKVAR_H_
#define _DEV_PCI_IF_MSKVAR_H_
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
struct sk_jpool_entry {
int slot;
diff --git a/sys/dev/pci/if_pcn.c b/sys/dev/pci/if_pcn.c
index 2fccbb9dd05..93e8feadec2 100644
--- a/sys/dev/pci/if_pcn.c
+++ b/sys/dev/pci/if_pcn.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pcn.c,v 1.58 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_pcn.c,v 1.59 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.58 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.59 2015/04/13 16:33:25 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -79,7 +79,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.58 2014/08/10 16:44:36 tls Exp $");
#include <sys/device.h>
#include <sys/queue.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/pci/if_sip.c b/sys/dev/pci/if_sip.c
index 568ade45d95..4d9d5bd00bc 100644
--- a/sys/dev/pci/if_sip.c
+++ b/sys/dev/pci/if_sip.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sip.c,v 1.158 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_sip.c,v 1.159 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.158 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.159 2015/04/13 16:33:25 riastradh Exp $");
@@ -89,7 +89,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.158 2014/08/10 16:44:36 tls Exp $");
#include <sys/device.h>
#include <sys/queue.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index addd34e8471..dc93aac7b2f 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sk.c,v 1.79 2014/12/10 00:15:26 christos Exp $ */
+/* $NetBSD: if_sk.c,v 1.80 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.79 2014/12/10 00:15:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.80 2015/04/13 16:33:25 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -138,7 +138,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.79 2014/12/10 00:15:26 christos Exp $");
#include <net/if_media.h>
#include <net/bpf.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_skvar.h b/sys/dev/pci/if_skvar.h
index 217aa07b21b..983e79d9ba9 100644
--- a/sys/dev/pci/if_skvar.h
+++ b/sys/dev/pci/if_skvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_skvar.h,v 1.17 2012/02/02 19:43:05 tls Exp $ */
+/* $NetBSD: if_skvar.h,v 1.18 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@
#ifndef _DEV_PCI_IF_SKVAR_H_
#define _DEV_PCI_IF_SKVAR_H_
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
struct sk_jpool_entry {
int slot;
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index c9d688d59ea..bf5036c806b 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tl.c,v 1.101 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_tl.c,v 1.102 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.101 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.102 2015/04/13 16:33:25 riastradh Exp $");
#undef TLDEBUG
#define TL_PRIV_STATS
@@ -65,7 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.101 2014/08/10 16:44:36 tls Exp $");
#include <net/bpf.h>
#include <net/bpfdesc.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#ifdef INET
#include <netinet/in.h>
diff --git a/sys/dev/pci/if_tlvar.h b/sys/dev/pci/if_tlvar.h
index 49a1b0bf005..0094928b47b 100644
--- a/sys/dev/pci/if_tlvar.h
+++ b/sys/dev/pci/if_tlvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlvar.h,v 1.16 2012/02/02 19:43:05 tls Exp $ */
+/* $NetBSD: if_tlvar.h,v 1.17 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@@ -30,7 +30,7 @@
* available from www.ti.com
*/
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <dev/i2c/i2cvar.h>
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c
index 758e2d649b7..06ec0814f2f 100644
--- a/sys/dev/pci/if_vr.c
+++ b/sys/dev/pci/if_vr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vr.c,v 1.114 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_vr.c,v 1.115 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.114 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.115 2015/04/13 16:33:25 riastradh Exp $");
@@ -111,7 +111,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.114 2014/08/10 16:44:36 tls Exp $");
#include <sys/socket.h>
#include <sys/device.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_arp.h>
diff --git a/sys/dev/pci/if_vte.c b/sys/dev/pci/if_vte.c
index 154c99b0953..f0f1293e6d6 100644
--- a/sys/dev/pci/if_vte.c
+++ b/sys/dev/pci/if_vte.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vte.c,v 1.11 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_vte.c,v 1.12 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 2011 Manuel Bouyer. All rights reserved.
@@ -55,7 +55,7 @@
/* Driver for DM&P Electronics, Inc, Vortex86 RDC R6040 FastEthernet. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.11 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.12 2015/04/13 16:33:25 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -79,7 +79,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.11 2014/08/10 16:44:36 tls Exp $");
#include <net/bpf.h>
#include <net/bpfdesc.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include "opt_inet.h"
#include <net/if_ether.h>
diff --git a/sys/dev/pci/if_wm.c b/sys/dev/pci/if_wm.c
index 837381078d0..bd9b16149d3 100644
--- a/sys/dev/pci/if_wm.c
+++ b/sys/dev/pci/if_wm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.314 2015/03/28 17:35:59 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.315 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.314 2015/03/28 17:35:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.315 2015/04/13 16:33:25 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -100,7 +100,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.314 2015/03/28 17:35:59 msaitoh Exp $");
#include <sys/queue.h>
#include <sys/syslog.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c
index 4a949744c7a..ffd22b3c80a 100644
--- a/sys/dev/pci/if_xge.c
+++ b/sys/dev/pci/if_xge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xge.c,v 1.19 2014/03/29 19:28:25 christos Exp $ */
+/* $NetBSD: if_xge.c,v 1.20 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 2004, SUNET, Swedish University Computer Network.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xge.c,v 1.19 2014/03/29 19:28:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xge.c,v 1.20 2015/04/13 16:33:25 riastradh Exp $");
#include <sys/param.h>
@@ -54,8 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_xge.c,v 1.19 2014/03/29 19:28:25 christos Exp $")
#include <sys/socket.h>
#include <sys/device.h>
-#include <sys/rnd.h>
-
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_media.h>
diff --git a/sys/dev/pci/ld_amr.c b/sys/dev/pci/ld_amr.c
index 6de71ab4a56..fada53c306c 100644
--- a/sys/dev/pci/ld_amr.c
+++ b/sys/dev/pci/ld_amr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_amr.c,v 1.22 2015/03/02 15:26:57 christos Exp $ */
+/* $NetBSD: ld_amr.c,v 1.23 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_amr.c,v 1.22 2015/03/02 15:26:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_amr.c,v 1.23 2015/04/13 16:33:25 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: ld_amr.c,v 1.22 2015/03/02 15:26:57 christos Exp $")
#include <sys/endian.h>
#include <sys/dkio.h>
#include <sys/disk.h>
-#include <sys/rnd.h>
#include <sys/bus.h>
diff --git a/sys/dev/pci/ld_twa.c b/sys/dev/pci/ld_twa.c
index 8ca1bf1b6c9..2da417ed574 100644
--- a/sys/dev/pci/ld_twa.c
+++ b/sys/dev/pci/ld_twa.c
@@ -1,5 +1,5 @@
/* $wasabi: ld_twa.c,v 1.9 2006/02/14 18:44:37 jordanr Exp $ */
-/* $NetBSD: ld_twa.c,v 1.16 2013/10/17 21:06:15 christos Exp $ */
+/* $NetBSD: ld_twa.c,v 1.17 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_twa.c,v 1.16 2013/10/17 21:06:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_twa.c,v 1.17 2015/04/13 16:33:25 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: ld_twa.c,v 1.16 2013/10/17 21:06:15 christos Exp $")
#include <sys/dkio.h>
#include <sys/disk.h>
#include <sys/proc.h>
-#include <sys/rnd.h>
#include <sys/bus.h>
diff --git a/sys/dev/pci/ld_twe.c b/sys/dev/pci/ld_twe.c
index 2b0cf8da704..252ad050bdc 100644
--- a/sys/dev/pci/ld_twe.c
+++ b/sys/dev/pci/ld_twe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_twe.c,v 1.36 2012/02/02 19:43:06 tls Exp $ */
+/* $NetBSD: ld_twe.c,v 1.37 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_twe.c,v 1.36 2012/02/02 19:43:06 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_twe.c,v 1.37 2015/04/13 16:33:25 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,7 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: ld_twe.c,v 1.36 2012/02/02 19:43:06 tls Exp $");
#include <sys/dkio.h>
#include <sys/disk.h>
#include <sys/proc.h>
-#include <sys/rnd.h>
#include <sys/bus.h>
diff --git a/sys/dev/pci/ld_virtio.c b/sys/dev/pci/ld_virtio.c
index 670669cf6fe..861a9566b79 100644
--- a/sys/dev/pci/ld_virtio.c
+++ b/sys/dev/pci/ld_virtio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_virtio.c,v 1.6 2014/07/22 01:55:54 ozaki-r Exp $ */
+/* $NetBSD: ld_virtio.c,v 1.7 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_virtio.c,v 1.6 2014/07/22 01:55:54 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_virtio.c,v 1.7 2015/04/13 16:33:25 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -36,7 +36,6 @@ __KERNEL_RCSID(0, "$NetBSD: ld_virtio.c,v 1.6 2014/07/22 01:55:54 ozaki-r Exp $"
#include <sys/device.h>
#include <sys/disk.h>
#include <sys/mutex.h>
-#include <sys/rnd.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/n8/common/config.c b/sys/dev/pci/n8/common/config.c
index d24c20eb079..9088ec3a97e 100644
--- a/sys/dev/pci/n8/common/config.c
+++ b/sys/dev/pci/n8/common/config.c
@@ -32,7 +32,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-static char const n8_id[] = "$Id: config.c,v 1.3 2010/11/13 13:52:09 uebayasi Exp $";
+static char const n8_id[] = "$Id: config.c,v 1.4 2015/04/13 16:33:25 riastradh Exp $";
/*****************************************************************************/
/** @file config.c
* @brief NSP2000 Device Driver Configuration Manager.
@@ -177,7 +177,6 @@ static char const n8_id[] = "$Id: config.c,v 1.3 2010/11/13 13:52:09 uebayasi Ex
#include <opencrypto/cryptodev.h>
#include <opencrypto/xform.h>
-#include <sys/rnd.h>
#include <sys/md5.h>
#include <sys/sha1.h>
diff --git a/sys/dev/pci/n8/nsp.c b/sys/dev/pci/n8/nsp.c
index 52de45da305..772a3e94017 100644
--- a/sys/dev/pci/n8/nsp.c
+++ b/sys/dev/pci/n8/nsp.c
@@ -82,7 +82,6 @@
#include <opencrypto/cryptodev.h>
#include <opencrypto/xform.h>
-#include <sys/rnd.h>
#include <sys/md5.h>
#include <sys/sha1.h>
diff --git a/sys/dev/pci/viornd.c b/sys/dev/pci/viornd.c
index 2c9eac89494..5d911cdd756 100644
--- a/sys/dev/pci/viornd.c
+++ b/sys/dev/pci/viornd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: viornd.c,v 1.6 2015/04/08 13:47:06 riastradh Exp $ */
+/* $NetBSD: viornd.c,v 1.7 2015/04/13 16:33:25 riastradh Exp $ */
/* $OpenBSD: viornd.c,v 1.1 2014/01/21 21:14:58 sf Exp $ */
/*
@@ -51,7 +51,7 @@
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/callout.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <sys/mutex.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pcmcia/if_cs_pcmcia.c b/sys/dev/pcmcia/if_cs_pcmcia.c
index 8037688a7ca..57a2e1f58fa 100644
--- a/sys/dev/pcmcia/if_cs_pcmcia.c
+++ b/sys/dev/pcmcia/if_cs_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs_pcmcia.c,v 1.20 2012/10/27 17:18:36 chs Exp $ */
+/* $NetBSD: if_cs_pcmcia.c,v 1.21 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c)2001 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_pcmcia.c,v 1.20 2012/10/27 17:18:36 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_pcmcia.c,v 1.21 2015/04/13 16:33:25 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -35,8 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs_pcmcia.c,v 1.20 2012/10/27 17:18:36 chs Exp $"
#include <sys/socket.h>
#include <sys/queue.h>
-#include <sys/rnd.h>
-
#include <net/if.h>
#include <net/if_ether.h>
#include <net/if_media.h>
diff --git a/sys/dev/pcmcia/if_xivar.h b/sys/dev/pcmcia/if_xivar.h
index b10216db76f..bca834b0b18 100644
--- a/sys/dev/pcmcia/if_xivar.h
+++ b/sys/dev/pcmcia/if_xivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xivar.h,v 1.8 2012/02/02 19:43:06 tls Exp $ */
+/* $NetBSD: if_xivar.h,v 1.9 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 2004 Charles M. Hannum. All rights reserved.
@@ -18,7 +18,7 @@
* derived from this software without specific prior written permission.
*/
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
struct xi_softc {
device_t sc_dev; /* Generic device info */
diff --git a/sys/dev/sbus/be.c b/sys/dev/sbus/be.c
index eea6fa26d14..7241ca659b2 100644
--- a/sys/dev/sbus/be.c
+++ b/sys/dev/sbus/be.c
@@ -1,4 +1,4 @@
-/* $NetBSD: be.c,v 1.80 2013/06/09 09:23:35 msaitoh Exp $ */
+/* $NetBSD: be.c,v 1.81 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.80 2013/06/09 09:23:35 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.81 2015/04/13 16:33:25 riastradh Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -73,7 +73,6 @@ __KERNEL_RCSID(0, "$NetBSD: be.c,v 1.80 2013/06/09 09:23:35 msaitoh Exp $");
#include <sys/syslog.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <sys/rnd.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/sbus/qe.c b/sys/dev/sbus/qe.c
index 9a831a22e9d..24d1c5afbe9 100644
--- a/sys/dev/sbus/qe.c
+++ b/sys/dev/sbus/qe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: qe.c,v 1.62 2012/06/23 17:21:12 jdc Exp $ */
+/* $NetBSD: qe.c,v 1.63 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.62 2012/06/23 17:21:12 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.63 2015/04/13 16:33:25 riastradh Exp $");
#define QEDEBUG
@@ -83,7 +83,6 @@ __KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.62 2012/06/23 17:21:12 jdc Exp $");
#include <sys/syslog.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <sys/rnd.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/scsipi/cd.c b/sys/dev/scsipi/cd.c
index 19585077cd3..058ff512d8d 100644
--- a/sys/dev/scsipi/cd.c
+++ b/sys/dev/scsipi/cd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.328 2015/01/02 19:42:07 christos Exp $ */
+/* $NetBSD: cd.c,v 1.329 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.328 2015/01/02 19:42:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.329 2015/04/13 16:33:25 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,7 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.328 2015/01/02 19:42:07 christos Exp $");
#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/vnode.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <dev/scsipi/scsi_spc.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/scsipi/sd.c b/sys/dev/scsipi/sd.c
index 3bf9528f159..407f614a8a7 100644
--- a/sys/dev/scsipi/sd.c
+++ b/sys/dev/scsipi/sd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.314 2015/01/02 19:42:07 christos Exp $ */
+/* $NetBSD: sd.c,v 1.315 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.314 2015/01/02 19:42:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.315 2015/04/13 16:33:25 riastradh Exp $");
#include "opt_scsi.h"
@@ -69,8 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.314 2015/01/02 19:42:07 christos Exp $");
#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/vnode.h>
-#include <sys/rnd.h>
-#include <sys/cprng.h>
+#include <sys/rndsource.h>
#include <dev/scsipi/scsi_spc.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/scsipi/sdvar.h b/sys/dev/scsipi/sdvar.h
index ba4de6e6878..8244002eadd 100644
--- a/sys/dev/scsipi/sdvar.h
+++ b/sys/dev/scsipi/sdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sdvar.h,v 1.35 2014/09/05 05:30:23 matt Exp $ */
+/* $NetBSD: sdvar.h,v 1.36 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@
#include "opt_scsi.h"
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#ifndef SDRETRIES
#define SDRETRIES 4
diff --git a/sys/dev/scsipi/stvar.h b/sys/dev/scsipi/stvar.h
index 0ad4dce4da3..78f20c8a274 100644
--- a/sys/dev/scsipi/stvar.h
+++ b/sys/dev/scsipi/stvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: stvar.h,v 1.24 2012/02/28 10:58:11 mbalmer Exp $ */
+/* $NetBSD: stvar.h,v 1.25 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
* A lot of rewhacking done by mjacob (mjacob@nas.nasa.gov).
*/
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsiconf.h>
diff --git a/sys/dev/sdmmc/ld_sdmmc.c b/sys/dev/sdmmc/ld_sdmmc.c
index ce148a110f5..ca8de48116f 100644
--- a/sys/dev/sdmmc/ld_sdmmc.c
+++ b/sys/dev/sdmmc/ld_sdmmc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_sdmmc.c,v 1.14 2014/10/02 21:49:22 jmcneill Exp $ */
+/* $NetBSD: ld_sdmmc.c,v 1.15 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_sdmmc.c,v 1.14 2014/10/02 21:49:22 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_sdmmc.c,v 1.15 2015/04/13 16:33:25 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: ld_sdmmc.c,v 1.14 2014/10/02 21:49:22 jmcneill Exp $
#include <sys/dkio.h>
#include <sys/disk.h>
#include <sys/kthread.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <dev/ldvar.h>
diff --git a/sys/dev/sysmon/sysmon_envsys.c b/sys/dev/sysmon/sysmon_envsys.c
index 2c43d42b97c..9e59229c640 100644
--- a/sys/dev/sysmon/sysmon_envsys.c
+++ b/sys/dev/sysmon/sysmon_envsys.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.129 2015/03/14 09:52:49 hannken Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.130 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.129 2015/03/14 09:52:49 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.130 2015/04/13 16:33:25 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -76,7 +76,7 @@ __KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.129 2015/03/14 09:52:49 hannken
#include <sys/proc.h>
#include <sys/mutex.h>
#include <sys/kmem.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <dev/sysmon/sysmonvar.h>
#include <dev/sysmon/sysmon_envsysvar.h>
diff --git a/sys/dev/sysmon/sysmon_power.c b/sys/dev/sysmon/sysmon_power.c
index 04d878f425e..99060404623 100644
--- a/sys/dev/sysmon/sysmon_power.c
+++ b/sys/dev/sysmon/sysmon_power.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_power.c,v 1.52 2015/04/04 15:31:17 christos Exp $ */
+/* $NetBSD: sysmon_power.c,v 1.53 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.52 2015/04/04 15:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.53 2015/04/13 16:33:25 riastradh Exp $");
#include "opt_compat_netbsd.h"
#include <sys/param.h>
@@ -83,7 +83,7 @@ __KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.52 2015/04/04 15:31:17 christos E
#include <sys/kmem.h>
#include <sys/proc.h>
#include <sys/device.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <dev/sysmon/sysmonvar.h>
#include <prop/proplib.h>
diff --git a/sys/dev/sysmon/sysmonvar.h b/sys/dev/sysmon/sysmonvar.h
index 3217c65baa2..6fe2e0b97d3 100644
--- a/sys/dev/sysmon/sysmonvar.h
+++ b/sys/dev/sysmon/sysmonvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmonvar.h,v 1.46 2015/03/14 09:52:49 hannken Exp $ */
+/* $NetBSD: sysmonvar.h,v 1.47 2015/04/13 16:33:25 riastradh Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -44,7 +44,7 @@
#include <sys/callout.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
struct lwp;
struct proc;
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 6ae2a1d36ad..9d9343a967e 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aue.c,v 1.132 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_aue.c,v 1.133 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.132 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.133 2015/04/13 16:33:25 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -93,7 +93,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.132 2014/08/10 16:44:36 tls Exp $");
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/device.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_arp.h>
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 6ae9bc7e685..13f202978e5 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.68 2015/04/08 12:38:13 nonaka Exp $ */
+/* $NetBSD: if_axe.c,v 1.69 2015/04/13 16:33:25 riastradh Exp $ */
/* $OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */
/*
@@ -89,7 +89,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.68 2015/04/08 12:38:13 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.69 2015/04/13 16:33:25 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -106,7 +106,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.68 2015/04/08 12:38:13 nonaka Exp $");
#include <sys/sockio.h>
#include <sys/systm.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/usb/if_axen.c b/sys/dev/usb/if_axen.c
index 8c21372e8ec..3ccd7bffd4e 100644
--- a/sys/dev/usb/if_axen.c
+++ b/sys/dev/usb/if_axen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axen.c,v 1.5 2015/04/08 12:38:13 nonaka Exp $ */
+/* $NetBSD: if_axen.c,v 1.6 2015/04/13 16:33:25 riastradh Exp $ */
/* $OpenBSD: if_axen.c,v 1.3 2013/10/21 10:10:22 yuo Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.5 2015/04/08 12:38:13 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.6 2015/04/13 16:33:25 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.5 2015/04/08 12:38:13 nonaka Exp $");
#include <sys/sockio.h>
#include <sys/systm.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c
index fa960235e5f..52067ab3c19 100644
--- a/sys/dev/usb/if_cdce.c
+++ b/sys/dev/usb/if_cdce.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cdce.c,v 1.38 2013/01/05 01:30:15 christos Exp $ */
+/* $NetBSD: if_cdce.c,v 1.39 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.38 2013/01/05 01:30:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.39 2015/04/13 16:33:25 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -55,8 +55,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.38 2013/01/05 01:30:15 christos Exp $"
#include <sys/socket.h>
#include <sys/device.h>
-#include <sys/rnd.h>
-
#include <net/if.h>
#include <net/if_arp.h>
#include <net/if_dl.h>
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index f5f6777e2b5..b3c8dc8ecf8 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cue.c,v 1.68 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_cue.c,v 1.69 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.68 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.69 2015/04/13 16:33:25 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -72,7 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.68 2014/08/10 16:44:36 tls Exp $");
#include <sys/socket.h>
#include <sys/bus.h>
#include <sys/device.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_arp.h>
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 389d94b76b5..b69c0d3b156 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kue.c,v 1.81 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_kue.c,v 1.82 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.81 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.82 2015/04/13 16:33:25 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -86,7 +86,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.81 2014/08/10 16:44:36 tls Exp $");
#include <sys/socket.h>
#include <sys/device.h>
#include <sys/proc.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_arp.h>
diff --git a/sys/dev/usb/if_smsc.c b/sys/dev/usb/if_smsc.c
index 960e6776168..59c6af08b1d 100644
--- a/sys/dev/usb/if_smsc.c
+++ b/sys/dev/usb/if_smsc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smsc.c,v 1.22 2014/09/20 15:07:06 jmcneill Exp $ */
+/* $NetBSD: if_smsc.c,v 1.23 2015/04/13 16:33:25 riastradh Exp $ */
/* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -77,7 +77,7 @@
#include <sys/device.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 48607e5a562..455481af9a6 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_udav.c,v 1.43 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_udav.c,v 1.44 2015/04/13 16:33:25 riastradh Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.43 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.44 2015/04/13 16:33:25 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -58,7 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.43 2014/08/10 16:44:36 tls Exp $");
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/device.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_arp.h>
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c
index 2b154b41cd0..82095cd82be 100644
--- a/sys/dev/usb/if_upl.c
+++ b/sys/dev/usb/if_upl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upl.c,v 1.47 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_upl.c,v 1.48 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.47 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.48 2015/04/13 16:33:25 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.47 2014/08/10 16:44:36 tls Exp $");
#include <sys/socket.h>
#include <sys/device.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_types.h>
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c
index f0e05b937b5..0d3d41a9dc5 100644
--- a/sys/dev/usb/if_url.c
+++ b/sys/dev/usb/if_url.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_url.c,v 1.48 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_url.c,v 1.49 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 2001, 2002
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.48 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.49 2015/04/13 16:33:25 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -58,7 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.48 2014/08/10 16:44:36 tls Exp $");
#include <sys/socket.h>
#include <sys/device.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_arp.h>
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index b80c394444c..ecc411a52d2 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ucom.c,v 1.108 2014/11/15 19:18:19 christos Exp $ */
+/* $NetBSD: ucom.c,v 1.109 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.108 2014/11/15 19:18:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.109 2015/04/13 16:33:25 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.108 2014/11/15 19:18:19 christos Exp $");
#include <sys/queue.h>
#include <sys/kauth.h>
#include <sys/timepps.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <dev/usb/usb.h>
diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c
index 2589c9eeb47..e497226b345 100644
--- a/sys/dev/usb/uhidev.c
+++ b/sys/dev/usb/uhidev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhidev.c,v 1.63 2015/03/07 20:20:55 mrg Exp $ */
+/* $NetBSD: uhidev.c,v 1.64 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 2001, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.63 2015/03/07 20:20:55 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.64 2015/04/13 16:33:25 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,6 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.63 2015/03/07 20:20:55 mrg Exp $");
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/conf.h>
+#include <sys/rndsource.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>
diff --git a/sys/dev/usb/uhidev.h b/sys/dev/usb/uhidev.h
index 6592d534645..63fb0c3eff8 100644
--- a/sys/dev/usb/uhidev.h
+++ b/sys/dev/usb/uhidev.h
@@ -1,4 +1,4 @@
-/* $NetBSD: uhidev.h,v 1.17 2015/03/07 20:20:55 mrg Exp $ */
+/* $NetBSD: uhidev.h,v 1.18 2015/04/13 16:33:25 riastradh Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
struct uhidev_softc {
device_t sc_dev; /* base device */