CVS commit: src/sys/dev

Taylor R Campbell Mon, 13 Apr 2015 09:34:46 -0700

Module Name:    src
Committed By:   riastradh
Date:           Mon Apr 13 16:33:25 UTC 2015


Modified Files:
        src/sys/dev: ld.c ldvar.h
        src/sys/dev/acpi: fdc_acpi.c
        src/sys/dev/ata: ld_ataraid.c wd.c wdvar.h
        src/sys/dev/cardbus: if_fxp_cardbus.c if_rtk_cardbus.c rbus_ppb.c
        src/sys/dev/gpib: rd.c
        src/sys/dev/i2o: ld_iop.c
        src/sys/dev/ic: am7990.c am79900.c com.c comvar.h cs89x0.c cs89x0var.h
            dp8390.c dp8390var.h elink3.c elink3var.h elinkxl.c elinkxlvar.h
            gemvar.h hme.c hmevar.h i82557.c i82557var.h lan9118.c lan9118var.h
            lance.c lancevar.h ld_aac.c ld_cac.c ld_icp.c ld_mlx.c lemac.c
            lemacvar.h mb86950.c mb86960.c mb86960var.h mtd803var.h pckbc.c
            pckbcvar.h rtl8169.c rtl81x9.c rtl81x9var.h seeq8005.c
            seeq8005var.h smc91cxx.c smc91cxxvar.h tulipvar.h
        src/sys/dev/isa: cs89x0isa.c fd.c fdc_isa.c fdvar.h if_cs_isa.c if_eg.c
            if_el.c if_iy.c if_tscs_isa.c
        src/sys/dev/isapnp: if_cs_isapnp.c
        src/sys/dev/iscsi: iscsi_globals.h iscsi_test.c
        src/sys/dev/marvell: if_gfe.c if_mvgbe.c
        src/sys/dev/mca: ed_mca.c edc_mca.c if_tra_mca.c
        src/sys/dev/ofisa: if_cs_ofisa.c
        src/sys/dev/pci: amdpm.c amdpm_smbus.c amdpmvar.h auich.c hifn7751.c
            if_age.c if_alc.c if_ale.c if_bce.c if_bge.c if_cas.c if_de.c
            if_devar.h if_dge.c if_fxp_pci.c if_jme.c if_msk.c if_mskvar.h
            if_pcn.c if_sip.c if_sk.c if_skvar.h if_tl.c if_tlvar.h if_vr.c
            if_vte.c if_wm.c if_xge.c ld_amr.c ld_twa.c ld_twe.c ld_virtio.c
            viornd.c
        src/sys/dev/pci/n8: nsp.c
        src/sys/dev/pci/n8/common: config.c
        src/sys/dev/pcmcia: if_cs_pcmcia.c if_xivar.h
        src/sys/dev/sbus: be.c qe.c
        src/sys/dev/scsipi: cd.c sd.c sdvar.h stvar.h
        src/sys/dev/sdmmc: ld_sdmmc.c
        src/sys/dev/sysmon: sysmon_envsys.c sysmon_power.c sysmonvar.h
        src/sys/dev/usb: if_aue.c if_axe.c if_axen.c if_cdce.c if_cue.c
            if_kue.c if_smsc.c if_udav.c if_upl.c if_url.c ucom.c uhidev.c
            uhidev.h

Log Message:
Convert sys/dev to use <sys/rndsource.h>.


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/dev/ld.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/ldvar.h
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/acpi/fdc_acpi.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/ata/ld_ataraid.c
cvs rdiff -u -r1.418 -r1.419 src/sys/dev/ata/wd.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/ata/wdvar.h
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/cardbus/if_fxp_cardbus.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/cardbus/if_rtk_cardbus.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/cardbus/rbus_ppb.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/gpib/rd.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/i2o/ld_iop.c
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/ic/am7990.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/ic/am79900.c src/sys/dev/ic/hmevar.h
cvs rdiff -u -r1.332 -r1.333 src/sys/dev/ic/com.c
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/ic/comvar.h
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/ic/cs89x0.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/ic/cs89x0var.h
cvs rdiff -u -r1.81 -r1.82 src/sys/dev/ic/dp8390.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/ic/dp8390var.h
cvs rdiff -u -r1.135 -r1.136 src/sys/dev/ic/elink3.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/ic/elink3var.h
cvs rdiff -u -r1.116 -r1.117 src/sys/dev/ic/elinkxl.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/ic/elinkxlvar.h \
    src/sys/dev/ic/gemvar.h
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/ic/hme.c
cvs rdiff -u -r1.142 -r1.143 src/sys/dev/ic/i82557.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/ic/i82557var.h
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/ic/lan9118.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/lan9118var.h
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/ic/lance.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/ic/lancevar.h
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/ic/ld_aac.c src/sys/dev/ic/ld_cac.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/ic/ld_icp.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/ic/ld_mlx.c src/sys/dev/ic/pckbcvar.h
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/ic/lemac.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/ic/lemacvar.h
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/ic/mb86950.c
cvs rdiff -u -r1.80 -r1.81 src/sys/dev/ic/mb86960.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/ic/mb86960var.h
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/ic/mtd803var.h
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/ic/pckbc.c
cvs rdiff -u -r1.143 -r1.144 src/sys/dev/ic/rtl8169.c
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/ic/rtl81x9.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/ic/rtl81x9var.h
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/ic/seeq8005.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ic/seeq8005var.h
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/ic/smc91cxx.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/ic/smc91cxxvar.h
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/ic/tulipvar.h
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/isa/cs89x0isa.c
cvs rdiff -u -r1.107 -r1.108 src/sys/dev/isa/fd.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/isa/fdc_isa.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/isa/fdvar.h
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/isa/if_cs_isa.c
cvs rdiff -u -r1.87 -r1.88 src/sys/dev/isa/if_eg.c
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/isa/if_el.c
cvs rdiff -u -r1.93 -r1.94 src/sys/dev/isa/if_iy.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/isa/if_tscs_isa.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/isapnp/if_cs_isapnp.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/iscsi/iscsi_globals.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/iscsi/iscsi_test.c
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/marvell/if_gfe.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/marvell/if_mvgbe.c
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/mca/ed_mca.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/mca/edc_mca.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/mca/if_tra_mca.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ofisa/if_cs_ofisa.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/pci/amdpm.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pci/amdpm_smbus.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/amdpmvar.h
cvs rdiff -u -r1.144 -r1.145 src/sys/dev/pci/auich.c src/sys/dev/pci/if_de.c
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/hifn7751.c
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/pci/if_age.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/if_alc.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/if_ale.c \
    src/sys/dev/pci/if_skvar.h
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/pci/if_bce.c src/sys/dev/pci/if_dge.c
cvs rdiff -u -r1.281 -r1.282 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pci/if_cas.c src/sys/dev/pci/ld_amr.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/if_devar.h \
    src/sys/dev/pci/if_pcn.c
cvs rdiff -u -r1.81 -r1.82 src/sys/dev/pci/if_fxp_pci.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/if_jme.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/pci/if_msk.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/if_mskvar.h \
    src/sys/dev/pci/if_vte.c
cvs rdiff -u -r1.158 -r1.159 src/sys/dev/pci/if_sip.c
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/pci/if_sk.c
cvs rdiff -u -r1.101 -r1.102 src/sys/dev/pci/if_tl.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/if_tlvar.h \
    src/sys/dev/pci/ld_twa.c
cvs rdiff -u -r1.114 -r1.115 src/sys/dev/pci/if_vr.c
cvs rdiff -u -r1.314 -r1.315 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/pci/if_xge.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/pci/ld_twe.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/ld_virtio.c src/sys/dev/pci/viornd.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/n8/nsp.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/n8/common/config.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pcmcia/if_cs_pcmcia.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pcmcia/if_xivar.h
cvs rdiff -u -r1.80 -r1.81 src/sys/dev/sbus/be.c
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/sbus/qe.c
cvs rdiff -u -r1.328 -r1.329 src/sys/dev/scsipi/cd.c
cvs rdiff -u -r1.314 -r1.315 src/sys/dev/scsipi/sd.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/scsipi/sdvar.h
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/scsipi/stvar.h
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/sdmmc/ld_sdmmc.c
cvs rdiff -u -r1.129 -r1.130 src/sys/dev/sysmon/sysmon_envsys.c
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/sysmon/sysmon_power.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/sysmon/sysmonvar.h
cvs rdiff -u -r1.132 -r1.133 src/sys/dev/usb/if_aue.c
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/usb/if_axe.c src/sys/dev/usb/if_cue.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/if_axen.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/usb/if_cdce.c
cvs rdiff -u -r1.81 -r1.82 src/sys/dev/usb/if_kue.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/usb/if_smsc.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/usb/if_udav.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/usb/if_upl.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/usb/if_url.c
cvs rdiff -u -r1.108 -r1.109 src/sys/dev/usb/ucom.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/usb/uhidev.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/usb/uhidev.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/ld.c
diff -u src/sys/dev/ld.c:1.81 src/sys/dev/ld.c:1.82
--- src/sys/dev/ld.c:1.81	Fri Jan  2 19:42:06 2015
+++ src/sys/dev/ld.c	Mon Apr 13 16:33:23 2015
@@ -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 
 #include <sys/vnode.h>
 #include <sys/syslog.h>
 #include <sys/mutex.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
 
 #include <dev/ldvar.h>
 

Index: src/sys/dev/ldvar.h
diff -u src/sys/dev/ldvar.h:1.21 src/sys/dev/ldvar.h:1.22
--- src/sys/dev/ldvar.h:1.21	Thu May  3 21:21:08 2012
+++ src/sys/dev/ldvar.h	Mon Apr 13 16:33:23 2015
@@ -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;

Index: src/sys/dev/acpi/fdc_acpi.c
diff -u src/sys/dev/acpi/fdc_acpi.c:1.42 src/sys/dev/acpi/fdc_acpi.c:1.43
--- src/sys/dev/acpi/fdc_acpi.c:1.42	Thu Feb  2 19:43:02 2012
+++ src/sys/dev/acpi/fdc_acpi.c	Mon Apr 13 16:33:23 2015
@@ -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 <jmcne...@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>
 

Index: src/sys/dev/ata/ld_ataraid.c
diff -u src/sys/dev/ata/ld_ataraid.c:1.39 src/sys/dev/ata/ld_ataraid.c:1.40
--- src/sys/dev/ata/ld_ataraid.c:1.39	Thu Feb  2 19:43:02 2012
+++ src/sys/dev/ata/ld_ataraid.c	Mon Apr 13 16:33:24 2015
@@ -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
 #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>

Index: src/sys/dev/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.418 src/sys/dev/ata/wd.c:1.419
--- src/sys/dev/ata/wd.c:1.418	Fri Jan  2 19:42:06 2015
+++ src/sys/dev/ata/wd.c	Mon Apr 13 16:33:24 2015
@@ -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
 #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>

Index: src/sys/dev/ata/wdvar.h
diff -u src/sys/dev/ata/wdvar.h:1.41 src/sys/dev/ata/wdvar.h:1.42
--- src/sys/dev/ata/wdvar.h:1.41	Wed Sep 10 07:04:48 2014
+++ src/sys/dev/ata/wdvar.h	Mon Apr 13 16:33:24 2015
@@ -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 */

Index: src/sys/dev/cardbus/if_fxp_cardbus.c
diff -u src/sys/dev/cardbus/if_fxp_cardbus.c:1.50 src/sys/dev/cardbus/if_fxp_cardbus.c:1.51
--- src/sys/dev/cardbus/if_fxp_cardbus.c:1.50	Thu Feb  2 19:43:02 2012
+++ src/sys/dev/cardbus/if_fxp_cardbus.c	Mon Apr 13 16:33:24 2015
@@ -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_cardb
 #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>

Index: src/sys/dev/cardbus/if_rtk_cardbus.c
diff -u src/sys/dev/cardbus/if_rtk_cardbus.c:1.47 src/sys/dev/cardbus/if_rtk_cardbus.c:1.48
--- src/sys/dev/cardbus/if_rtk_cardbus.c:1.47	Thu Feb  2 19:43:02 2012
+++ src/sys/dev/cardbus/if_rtk_cardbus.c	Mon Apr 13 16:33:24 2015
@@ -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_cardb
 #include <netinet/if_inarp.h>
 #endif
 
-#include <sys/rnd.h>
-
 #include <sys/bus.h>
 
 #include <dev/pci/pcireg.h>

Index: src/sys/dev/cardbus/rbus_ppb.c
diff -u src/sys/dev/cardbus/rbus_ppb.c:1.43 src/sys/dev/cardbus/rbus_ppb.c:1.44
--- src/sys/dev/cardbus/rbus_ppb.c:1.43	Fri Oct 17 20:52:00 2014
+++ src/sys/dev/cardbus/rbus_ppb.c	Mon Apr 13 16:33:24 2015
@@ -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
 #include <sys/device.h>
 #include <sys/kmem.h>
 
-#include <sys/rnd.h>
-
 #include <machine/endian.h>
 
 #include <sys/bus.h>

Index: src/sys/dev/gpib/rd.c
diff -u src/sys/dev/gpib/rd.c:1.39 src/sys/dev/gpib/rd.c:1.40
--- src/sys/dev/gpib/rd.c:1.39	Fri Jan  2 19:42:06 2015
+++ src/sys/dev/gpib/rd.c	Mon Apr 13 16:33:24 2015
@@ -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 
 #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>

Index: src/sys/dev/i2o/ld_iop.c
diff -u src/sys/dev/i2o/ld_iop.c:1.34 src/sys/dev/i2o/ld_iop.c:1.35
--- src/sys/dev/i2o/ld_iop.c:1.34	Thu Feb  2 19:43:02 2012
+++ src/sys/dev/i2o/ld_iop.c	Mon Apr 13 16:33:24 2015
@@ -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
 #include <sys/dkio.h>
 #include <sys/disk.h>
 #include <sys/proc.h>
-#include <sys/rnd.h>
 
 #include <sys/bus.h>
 

Index: src/sys/dev/ic/am7990.c
diff -u src/sys/dev/ic/am7990.c:1.74 src/sys/dev/ic/am7990.c:1.75
--- src/sys/dev/ic/am7990.c:1.74	Thu Feb  2 19:43:02 2012
+++ src/sys/dev/ic/am7990.c	Mon Apr 13 16:33:24 2015
@@ -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
 #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>

Index: src/sys/dev/ic/am79900.c
diff -u src/sys/dev/ic/am79900.c:1.23 src/sys/dev/ic/am79900.c:1.24
--- src/sys/dev/ic/am79900.c:1.23	Thu Feb  2 19:43:02 2012
+++ src/sys/dev/ic/am79900.c	Mon Apr 13 16:33:24 2015
@@ -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 
 #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>
Index: src/sys/dev/ic/hmevar.h
diff -u src/sys/dev/ic/hmevar.h:1.23 src/sys/dev/ic/hmevar.h:1.24
--- src/sys/dev/ic/hmevar.h:1.23	Thu Feb  2 19:43:03 2012
+++ src/sys/dev/ic/hmevar.h	Mon Apr 13 16:33:24 2015
@@ -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 */

Index: src/sys/dev/ic/com.c
diff -u src/sys/dev/ic/com.c:1.332 src/sys/dev/ic/com.c:1.333
--- src/sys/dev/ic/com.c:1.332	Sat Mar  7 22:13:16 2015
+++ src/sys/dev/ic/com.c	Mon Apr 13 16:33:24 2015
@@ -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.33
 #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.33
 #include <sys/kauth.h>
 #include <sys/intr.h>
 #ifdef RND_COM
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
 #endif
 
 

Index: src/sys/dev/ic/comvar.h
diff -u src/sys/dev/ic/comvar.h:1.79 src/sys/dev/ic/comvar.h:1.80
--- src/sys/dev/ic/comvar.h:1.79	Sat Nov 22 15:14:35 2014
+++ src/sys/dev/ic/comvar.h	Mon Apr 13 16:33:24 2015
@@ -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>

Index: src/sys/dev/ic/cs89x0.c
diff -u src/sys/dev/ic/cs89x0.c:1.34 src/sys/dev/ic/cs89x0.c:1.35
--- src/sys/dev/ic/cs89x0.c:1.34	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/ic/cs89x0.c	Mon Apr 13 16:33:24 2015
@@ -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
 #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>

Index: src/sys/dev/ic/cs89x0var.h
diff -u src/sys/dev/ic/cs89x0var.h:1.16 src/sys/dev/ic/cs89x0var.h:1.17
--- src/sys/dev/ic/cs89x0var.h:1.16	Thu Feb  2 19:43:03 2012
+++ src/sys/dev/ic/cs89x0var.h	Mon Apr 13 16:33:24 2015
@@ -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.
  *

Index: src/sys/dev/ic/dp8390.c
diff -u src/sys/dev/ic/dp8390.c:1.81 src/sys/dev/ic/dp8390.c:1.82
--- src/sys/dev/ic/dp8390.c:1.81	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/ic/dp8390.c	Mon Apr 13 16:33:24 2015
@@ -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
 #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>

Index: src/sys/dev/ic/dp8390var.h
diff -u src/sys/dev/ic/dp8390var.h:1.32 src/sys/dev/ic/dp8390var.h:1.33
--- src/sys/dev/ic/dp8390var.h:1.32	Thu Feb  2 19:43:03 2012
+++ src/sys/dev/ic/dp8390var.h	Mon Apr 13 16:33:24 2015
@@ -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

Index: src/sys/dev/ic/elink3.c
diff -u src/sys/dev/ic/elink3.c:1.135 src/sys/dev/ic/elink3.c:1.136
--- src/sys/dev/ic/elink3.c:1.135	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/ic/elink3.c	Mon Apr 13 16:33:24 2015
@@ -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
 #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>

Index: src/sys/dev/ic/elink3var.h
diff -u src/sys/dev/ic/elink3var.h:1.38 src/sys/dev/ic/elink3var.h:1.39
--- src/sys/dev/ic/elink3var.h:1.38	Thu Feb  2 19:43:03 2012
+++ src/sys/dev/ic/elink3var.h	Mon Apr 13 16:33:24 2015
@@ -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 <hpey...@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.

Index: src/sys/dev/ic/elinkxl.c
diff -u src/sys/dev/ic/elinkxl.c:1.116 src/sys/dev/ic/elinkxl.c:1.117
--- src/sys/dev/ic/elinkxl.c:1.116	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/ic/elinkxl.c	Mon Apr 13 16:33:24 2015
@@ -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 
 #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>

Index: src/sys/dev/ic/elinkxlvar.h
diff -u src/sys/dev/ic/elinkxlvar.h:1.24 src/sys/dev/ic/elinkxlvar.h:1.25
--- src/sys/dev/ic/elinkxlvar.h:1.24	Thu Feb  2 19:43:03 2012
+++ src/sys/dev/ic/elinkxlvar.h	Mon Apr 13 16:33:24 2015
@@ -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.
Index: src/sys/dev/ic/gemvar.h
diff -u src/sys/dev/ic/gemvar.h:1.24 src/sys/dev/ic/gemvar.h:1.25
--- src/sys/dev/ic/gemvar.h:1.24	Mon Jul  2 11:23:40 2012
+++ src/sys/dev/ic/gemvar.h	Mon Apr 13 16:33:24 2015
@@ -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.

Index: src/sys/dev/ic/hme.c
diff -u src/sys/dev/ic/hme.c:1.90 src/sys/dev/ic/hme.c:1.91
--- src/sys/dev/ic/hme.c:1.90	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/ic/hme.c	Mon Apr 13 16:33:24 2015
@@ -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
 #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>

Index: src/sys/dev/ic/i82557.c
diff -u src/sys/dev/ic/i82557.c:1.142 src/sys/dev/ic/i82557.c:1.143
--- src/sys/dev/ic/i82557.c:1.142	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/ic/i82557.c	Mon Apr 13 16:33:24 2015
@@ -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
 
 #include <machine/endian.h>
 
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>

Index: src/sys/dev/ic/i82557var.h
diff -u src/sys/dev/ic/i82557var.h:1.51 src/sys/dev/ic/i82557var.h:1.52
--- src/sys/dev/ic/i82557var.h:1.51	Sat Nov 22 19:50:00 2014
+++ src/sys/dev/ic/i82557var.h	Mon Apr 13 16:33:24 2015
@@ -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

Index: src/sys/dev/ic/lan9118.c
diff -u src/sys/dev/ic/lan9118.c:1.18 src/sys/dev/ic/lan9118.c:1.19
--- src/sys/dev/ic/lan9118.c:1.18	Mon Feb  9 07:53:39 2015
+++ src/sys/dev/ic/lan9118.c	Mon Apr 13 16:33:24 2015
@@ -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 
 #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>

Index: src/sys/dev/ic/lan9118var.h
diff -u src/sys/dev/ic/lan9118var.h:1.4 src/sys/dev/ic/lan9118var.h:1.5
--- src/sys/dev/ic/lan9118var.h:1.4	Thu Feb  2 19:43:03 2012
+++ src/sys/dev/ic/lan9118var.h	Mon Apr 13 16:33:24 2015
@@ -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*/
 

Index: src/sys/dev/ic/lance.c
diff -u src/sys/dev/ic/lance.c:1.47 src/sys/dev/ic/lance.c:1.48
--- src/sys/dev/ic/lance.c:1.47	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/ic/lance.c	Mon Apr 13 16:33:24 2015
@@ -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.
 #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>

Index: src/sys/dev/ic/lancevar.h
diff -u src/sys/dev/ic/lancevar.h:1.15 src/sys/dev/ic/lancevar.h:1.16
--- src/sys/dev/ic/lancevar.h:1.15	Thu Feb  2 19:43:03 2012
+++ src/sys/dev/ic/lancevar.h	Mon Apr 13 16:33:24 2015
@@ -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 */

Index: src/sys/dev/ic/ld_aac.c
diff -u src/sys/dev/ic/ld_aac.c:1.27 src/sys/dev/ic/ld_aac.c:1.28
--- src/sys/dev/ic/ld_aac.c:1.27	Sat Oct 27 17:18:21 2012
+++ src/sys/dev/ic/ld_aac.c	Mon Apr 13 16:33:24 2015
@@ -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
 #include <sys/endian.h>
 #include <sys/dkio.h>
 #include <sys/disk.h>
-#include <sys/rnd.h>
 
 #include <sys/bus.h>
 
Index: src/sys/dev/ic/ld_cac.c
diff -u src/sys/dev/ic/ld_cac.c:1.27 src/sys/dev/ic/ld_cac.c:1.28
--- src/sys/dev/ic/ld_cac.c:1.27	Fri Feb 24 18:04:51 2012
+++ src/sys/dev/ic/ld_cac.c	Mon Apr 13 16:33:24 2015
@@ -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
 #include <sys/endian.h>
 #include <sys/dkio.h>
 #include <sys/disk.h>
-#include <sys/rnd.h>
 
 #include <sys/bus.h>
 

Index: src/sys/dev/ic/ld_icp.c
diff -u src/sys/dev/ic/ld_icp.c:1.26 src/sys/dev/ic/ld_icp.c:1.27
--- src/sys/dev/ic/ld_icp.c:1.26	Sat Oct 27 17:18:21 2012
+++ src/sys/dev/ic/ld_icp.c	Mon Apr 13 16:33:24 2015
@@ -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
 #include <sys/endian.h>
 #include <sys/dkio.h>
 #include <sys/disk.h>
-#include <sys/rnd.h>
 
 #include <sys/bus.h>
 

Index: src/sys/dev/ic/ld_mlx.c
diff -u src/sys/dev/ic/ld_mlx.c:1.20 src/sys/dev/ic/ld_mlx.c:1.21
--- src/sys/dev/ic/ld_mlx.c:1.20	Thu Feb  2 19:43:03 2012
+++ src/sys/dev/ic/ld_mlx.c	Mon Apr 13 16:33:24 2015
@@ -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
 #include <sys/endian.h>
 #include <sys/dkio.h>
 #include <sys/disk.h>
-#include <sys/rnd.h>
 
 #include <machine/vmparam.h>
 #include <sys/bus.h>
Index: src/sys/dev/ic/pckbcvar.h
diff -u src/sys/dev/ic/pckbcvar.h:1.20 src/sys/dev/ic/pckbcvar.h:1.21
--- src/sys/dev/ic/pckbcvar.h:1.20	Sat Oct 13 18:14:09 2012
+++ src/sys/dev/ic/pckbcvar.h	Mon Apr 13 16:33:24 2015
@@ -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

Index: src/sys/dev/ic/lemac.c
diff -u src/sys/dev/ic/lemac.c:1.42 src/sys/dev/ic/lemac.c:1.43
--- src/sys/dev/ic/lemac.c:1.42	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/ic/lemac.c	Mon Apr 13 16:33:24 2015
@@ -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 <m...@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.
 #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>

Index: src/sys/dev/ic/lemacvar.h
diff -u src/sys/dev/ic/lemacvar.h:1.12 src/sys/dev/ic/lemacvar.h:1.13
--- src/sys/dev/ic/lemacvar.h:1.12	Sat Oct 27 17:18:21 2012
+++ src/sys/dev/ic/lemacvar.h	Mon Apr 13 16:33:24 2015
@@ -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 <m...@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.

Index: src/sys/dev/ic/mb86950.c
diff -u src/sys/dev/ic/mb86950.c:1.21 src/sys/dev/ic/mb86950.c:1.22
--- src/sys/dev/ic/mb86950.c:1.21	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/ic/mb86950.c	Mon Apr 13 16:33:24 2015
@@ -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 
 #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>

Index: src/sys/dev/ic/mb86960.c
diff -u src/sys/dev/ic/mb86960.c:1.80 src/sys/dev/ic/mb86960.c:1.81
--- src/sys/dev/ic/mb86960.c:1.80	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/ic/mb86960.c	Mon Apr 13 16:33:24 2015
@@ -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 
 #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>

Index: src/sys/dev/ic/mb86960var.h
diff -u src/sys/dev/ic/mb86960var.h:1.39 src/sys/dev/ic/mb86960var.h:1.40
--- src/sys/dev/ic/mb86960var.h:1.39	Thu Feb  2 19:43:03 2012
+++ src/sys/dev/ic/mb86960var.h	Mon Apr 13 16:33:24 2015
@@ -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.

Index: src/sys/dev/ic/mtd803var.h
diff -u src/sys/dev/ic/mtd803var.h:1.9 src/sys/dev/ic/mtd803var.h:1.10
--- src/sys/dev/ic/mtd803var.h:1.9	Sat Oct 27 17:18:22 2012
+++ src/sys/dev/ic/mtd803var.h	Mon Apr 13 16:33:24 2015
@@ -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>

Index: src/sys/dev/ic/pckbc.c
diff -u src/sys/dev/ic/pckbc.c:1.57 src/sys/dev/ic/pckbc.c:1.58
--- src/sys/dev/ic/pckbc.c:1.57	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/ic/pckbc.c	Mon Apr 13 16:33:24 2015
@@ -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.
 
 #include "locators.h"
 
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
 
 /* data per slave device */
 struct pckbc_slotdata {

Index: src/sys/dev/ic/rtl8169.c
diff -u src/sys/dev/ic/rtl8169.c:1.143 src/sys/dev/ic/rtl8169.c:1.144
--- src/sys/dev/ic/rtl8169.c:1.143	Sat Nov 22 00:17:07 2014
+++ src/sys/dev/ic/rtl8169.c	Mon Apr 13 16:33:24 2015
@@ -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 
 #include <netinet/ip.h>		/* XXX for IP_MAXPACKET */
 
 #include <net/bpf.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
 
 #include <sys/bus.h>
 

Index: src/sys/dev/ic/rtl81x9.c
diff -u src/sys/dev/ic/rtl81x9.c:1.95 src/sys/dev/ic/rtl81x9.c:1.96
--- src/sys/dev/ic/rtl81x9.c:1.95	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/ic/rtl81x9.c	Mon Apr 13 16:33:24 2015
@@ -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 
 #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>

Index: src/sys/dev/ic/rtl81x9var.h
diff -u src/sys/dev/ic/rtl81x9var.h:1.54 src/sys/dev/ic/rtl81x9var.h:1.55
--- src/sys/dev/ic/rtl81x9var.h:1.54	Fri Oct 10 17:41:05 2014
+++ src/sys/dev/ic/rtl81x9var.h	Mon Apr 13 16:33:24 2015
@@ -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

Index: src/sys/dev/ic/seeq8005.c
diff -u src/sys/dev/ic/seeq8005.c:1.52 src/sys/dev/ic/seeq8005.c:1.53
--- src/sys/dev/ic/seeq8005.c:1.52	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/ic/seeq8005.c	Mon Apr 13 16:33:24 2015
@@ -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
 #include <net/bpf.h>
 #include <net/bpfdesc.h>
 
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
 
 #include <sys/bus.h>
 #include <sys/intr.h>

Index: src/sys/dev/ic/seeq8005var.h
diff -u src/sys/dev/ic/seeq8005var.h:1.8 src/sys/dev/ic/seeq8005var.h:1.9
--- src/sys/dev/ic/seeq8005var.h:1.8	Wed Oct 10 22:17:44 2012
+++ src/sys/dev/ic/seeq8005var.h	Mon Apr 13 16:33:24 2015
@@ -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 {

Index: src/sys/dev/ic/smc91cxx.c
diff -u src/sys/dev/ic/smc91cxx.c:1.88 src/sys/dev/ic/smc91cxx.c:1.89
--- src/sys/dev/ic/smc91cxx.c:1.88	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/ic/smc91cxx.c	Mon Apr 13 16:33:24 2015
@@ -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
 #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>

Index: src/sys/dev/ic/smc91cxxvar.h
diff -u src/sys/dev/ic/smc91cxxvar.h:1.19 src/sys/dev/ic/smc91cxxvar.h:1.20
--- src/sys/dev/ic/smc91cxxvar.h:1.19	Sat Oct 27 17:18:22 2012
+++ src/sys/dev/ic/smc91cxxvar.h	Mon Apr 13 16:33:24 2015
@@ -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 */

Index: src/sys/dev/ic/tulipvar.h
diff -u src/sys/dev/ic/tulipvar.h:1.68 src/sys/dev/ic/tulipvar.h:1.69
--- src/sys/dev/ic/tulipvar.h:1.68	Sun Jul 22 14:32:58 2012
+++ src/sys/dev/ic/tulipvar.h	Mon Apr 13 16:33:24 2015
@@ -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)

Index: src/sys/dev/isa/cs89x0isa.c
diff -u src/sys/dev/isa/cs89x0isa.c:1.16 src/sys/dev/isa/cs89x0isa.c:1.17
--- src/sys/dev/isa/cs89x0isa.c:1.16	Thu Feb  2 19:43:04 2012
+++ src/sys/dev/isa/cs89x0isa.c	Mon Apr 13 16:33:24 2015
@@ -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,
 #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>

Index: src/sys/dev/isa/fd.c
diff -u src/sys/dev/isa/fd.c:1.107 src/sys/dev/isa/fd.c:1.108
--- src/sys/dev/isa/fd.c:1.107	Fri Jan  2 19:42:07 2015
+++ src/sys/dev/isa/fd.c	Mon Apr 13 16:33:24 2015
@@ -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
 #include <sys/fdio.h>
 #include <sys/conf.h>
 #include <sys/vnode.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
 
 #include <prop/proplib.h>
 

Index: src/sys/dev/isa/fdc_isa.c
diff -u src/sys/dev/isa/fdc_isa.c:1.19 src/sys/dev/isa/fdc_isa.c:1.20
--- src/sys/dev/isa/fdc_isa.c:1.19	Thu Feb  2 19:43:04 2012
+++ src/sys/dev/isa/fdc_isa.c	Mon Apr 13 16:33:24 2015
@@ -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 
 #include <sys/device.h>
 #include <sys/buf.h>
 #include <sys/queue.h>
-#include <sys/rnd.h>
 
 #include <sys/bus.h>
 #include <sys/intr.h>

Index: src/sys/dev/isa/fdvar.h
diff -u src/sys/dev/isa/fdvar.h:1.8 src/sys/dev/isa/fdvar.h:1.9
--- src/sys/dev/isa/fdvar.h:1.8	Thu Feb  2 19:43:04 2012
+++ src/sys/dev/isa/fdvar.h	Mon Apr 13 16:33:24 2015
@@ -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

Index: src/sys/dev/isa/if_cs_isa.c
diff -u src/sys/dev/isa/if_cs_isa.c:1.26 src/sys/dev/isa/if_cs_isa.c:1.27
--- src/sys/dev/isa/if_cs_isa.c:1.26	Thu Feb  2 19:43:04 2012
+++ src/sys/dev/isa/if_cs_isa.c	Mon Apr 13 16:33:24 2015
@@ -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>

Index: src/sys/dev/isa/if_eg.c
diff -u src/sys/dev/isa/if_eg.c:1.87 src/sys/dev/isa/if_eg.c:1.88
--- src/sys/dev/isa/if_eg.c:1.87	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/isa/if_eg.c	Mon Apr 13 16:33:24 2015
@@ -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 <d...@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.
 #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>

Index: src/sys/dev/isa/if_el.c
diff -u src/sys/dev/isa/if_el.c:1.90 src/sys/dev/isa/if_el.c:1.91
--- src/sys/dev/isa/if_el.c:1.90	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/isa/if_el.c	Mon Apr 13 16:33:24 2015
@@ -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.
 #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>

Index: src/sys/dev/isa/if_iy.c
diff -u src/sys/dev/isa/if_iy.c:1.93 src/sys/dev/isa/if_iy.c:1.94
--- src/sys/dev/isa/if_iy.c:1.93	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/isa/if_iy.c	Mon Apr 13 16:33:24 2015
@@ -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.
 #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>

Index: src/sys/dev/isa/if_tscs_isa.c
diff -u src/sys/dev/isa/if_tscs_isa.c:1.15 src/sys/dev/isa/if_tscs_isa.c:1.16
--- src/sys/dev/isa/if_tscs_isa.c:1.15	Thu Feb  2 19:43:04 2012
+++ src/sys/dev/isa/if_tscs_isa.c	Mon Apr 13 16:33:24 2015
@@ -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>

Index: src/sys/dev/isapnp/if_cs_isapnp.c
diff -u src/sys/dev/isapnp/if_cs_isapnp.c:1.18 src/sys/dev/isapnp/if_cs_isapnp.c:1.19
--- src/sys/dev/isapnp/if_cs_isapnp.c:1.18	Thu Feb  2 19:43:04 2012
+++ src/sys/dev/isapnp/if_cs_isapnp.c	Mon Apr 13 16:33:24 2015
@@ -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>

Index: src/sys/dev/iscsi/iscsi_globals.h
diff -u src/sys/dev/iscsi/iscsi_globals.h:1.6 src/sys/dev/iscsi/iscsi_globals.h:1.7
--- src/sys/dev/iscsi/iscsi_globals.h:1.6	Sat Dec 29 11:05:29 2012
+++ src/sys/dev/iscsi/iscsi_globals.h	Mon Apr 13 16:33:24 2015
@@ -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>

Index: src/sys/dev/iscsi/iscsi_test.c
diff -u src/sys/dev/iscsi/iscsi_test.c:1.3 src/sys/dev/iscsi/iscsi_test.c:1.4
--- src/sys/dev/iscsi/iscsi_test.c:1.3	Sat Dec 29 11:05:30 2012
+++ src/sys/dev/iscsi/iscsi_test.c	Mon Apr 13 16:33:24 2015
@@ -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

Index: src/sys/dev/marvell/if_gfe.c
diff -u src/sys/dev/marvell/if_gfe.c:1.44 src/sys/dev/marvell/if_gfe.c:1.45
--- src/sys/dev/marvell/if_gfe.c:1.44	Sun Jan 11 22:59:57 2015
+++ src/sys/dev/marvell/if_gfe.c	Mon Apr 13 16:33:24 2015
@@ -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
 #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>

Index: src/sys/dev/marvell/if_mvgbe.c
diff -u src/sys/dev/marvell/if_mvgbe.c:1.39 src/sys/dev/marvell/if_mvgbe.c:1.40
--- src/sys/dev/marvell/if_mvgbe.c:1.39	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/marvell/if_mvgbe.c	Mon Apr 13 16:33:24 2015
@@ -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
 #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>

Index: src/sys/dev/mca/ed_mca.c
diff -u src/sys/dev/mca/ed_mca.c:1.62 src/sys/dev/mca/ed_mca.c:1.63
--- src/sys/dev/mca/ed_mca.c:1.62	Fri Jan  2 19:42:07 2015
+++ src/sys/dev/mca/ed_mca.c	Mon Apr 13 16:33:24 2015
@@ -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
 #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>

Index: src/sys/dev/mca/edc_mca.c
diff -u src/sys/dev/mca/edc_mca.c:1.49 src/sys/dev/mca/edc_mca.c:1.50
--- src/sys/dev/mca/edc_mca.c:1.49	Thu Mar 20 06:48:54 2014
+++ src/sys/dev/mca/edc_mca.c	Mon Apr 13 16:33:24 2015
@@ -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 
 #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>

Index: src/sys/dev/mca/if_tra_mca.c
diff -u src/sys/dev/mca/if_tra_mca.c:1.16 src/sys/dev/mca/if_tra_mca.c:1.17
--- src/sys/dev/mca/if_tra_mca.c:1.16	Sat Oct 27 17:18:26 2012
+++ src/sys/dev/mca/if_tra_mca.c	Mon Apr 13 16:33:24 2015
@@ -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>

Index: src/sys/dev/ofisa/if_cs_ofisa.c
diff -u src/sys/dev/ofisa/if_cs_ofisa.c:1.25 src/sys/dev/ofisa/if_cs_ofisa.c:1.26
--- src/sys/dev/ofisa/if_cs_ofisa.c:1.25	Thu Feb  2 19:43:04 2012
+++ src/sys/dev/ofisa/if_cs_ofisa.c	Mon Apr 13 16:33:24 2015
@@ -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.
 #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>

Index: src/sys/dev/pci/amdpm.c
diff -u src/sys/dev/pci/amdpm.c:1.38 src/sys/dev/pci/amdpm.c:1.39
--- src/sys/dev/pci/amdpm.c:1.38	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/pci/amdpm.c	Mon Apr 13 16:33:25 2015
@@ -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.
 #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>

Index: src/sys/dev/pci/amdpm_smbus.c
diff -u src/sys/dev/pci/amdpm_smbus.c:1.20 src/sys/dev/pci/amdpm_smbus.c:1.21
--- src/sys/dev/pci/amdpm_smbus.c:1.20	Thu Jun 13 00:55:01 2013
+++ src/sys/dev/pci/amdpm_smbus.c	Mon Apr 13 16:33:25 2015
@@ -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_pub...@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>

Index: src/sys/dev/pci/amdpmvar.h
diff -u src/sys/dev/pci/amdpmvar.h:1.10 src/sys/dev/pci/amdpmvar.h:1.11
--- src/sys/dev/pci/amdpmvar.h:1.10	Thu Jun 13 00:55:01 2013
+++ src/sys/dev/pci/amdpmvar.h	Mon Apr 13 16:33:25 2015
@@ -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;

Index: src/sys/dev/pci/auich.c
diff -u src/sys/dev/pci/auich.c:1.144 src/sys/dev/pci/auich.c:1.145
--- src/sys/dev/pci/auich.c:1.144	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/pci/auich.c	Mon Apr 13 16:33:25 2015
@@ -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.
 #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>
Index: src/sys/dev/pci/if_de.c
diff -u src/sys/dev/pci/if_de.c:1.144 src/sys/dev/pci/if_de.c:1.145
--- src/sys/dev/pci/if_de.c:1.144	Sun Aug 10 16:44:36 2014
+++ src/sys/dev/pci/if_de.c	Mon Apr 13 16:33:25 2015
@@ -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 (m...@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.
 #endif
 
 #if defined(__NetBSD__)
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
 #endif
 
 #include <net/if.h>

Index: src/sys/dev/pci/hifn7751.c
diff -u src/sys/dev/pci/hifn7751.c:1.56 src/sys/dev/pci/hifn7751.c:1.57
--- src/sys/dev/pci/hifn7751.c:1.56	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/pci/hifn7751.c	Mon Apr 13 16:33:25 2015
@@ -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
 #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
 

Index: src/sys/dev/pci/if_age.c
diff -u src/sys/dev/pci/if_age.c:1.44 src/sys/dev/pci/if_age.c:1.45
--- src/sys/dev/pci/if_age.c:1.44	Sat Mar 29 19:28:24 2014
+++ src/sys/dev/pci/if_age.c	Mon Apr 13 16:33:25 2015
@@ -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
 
 #include <net/bpf.h>
 
-#include <sys/rnd.h>
-
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 

Index: src/sys/dev/pci/if_alc.c
diff -u src/sys/dev/pci/if_alc.c:1.13 src/sys/dev/pci/if_alc.c:1.14
--- src/sys/dev/pci/if_alc.c:1.13	Mon Jan 19 15:07:25 2015
+++ src/sys/dev/pci/if_alc.c	Mon Apr 13 16:33:25 2015
@@ -68,8 +68,6 @@
 
 #include <net/bpf.h>
 
-#include <sys/rnd.h>
-
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 

Index: src/sys/dev/pci/if_ale.c
diff -u src/sys/dev/pci/if_ale.c:1.17 src/sys/dev/pci/if_ale.c:1.18
--- src/sys/dev/pci/if_ale.c:1.17	Sat Mar 29 19:28:24 2014
+++ src/sys/dev/pci/if_ale.c	Mon Apr 13 16:33:25 2015
@@ -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 <yong...@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
 
 #include <net/bpf.h>
 
-#include <sys/rnd.h>
-
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
Index: src/sys/dev/pci/if_skvar.h
diff -u src/sys/dev/pci/if_skvar.h:1.17 src/sys/dev/pci/if_skvar.h:1.18
--- src/sys/dev/pci/if_skvar.h:1.17	Thu Feb  2 19:43:05 2012
+++ src/sys/dev/pci/if_skvar.h	Mon Apr 13 16:33:25 2015
@@ -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;

Index: src/sys/dev/pci/if_bce.c
diff -u src/sys/dev/pci/if_bce.c:1.39 src/sys/dev/pci/if_bce.c:1.40
--- src/sys/dev/pci/if_bce.c:1.39	Sun Aug 10 16:44:36 2014
+++ src/sys/dev/pci/if_bce.c	Mon Apr 13 16:33:25 2015
@@ -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
 #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>
Index: src/sys/dev/pci/if_dge.c
diff -u src/sys/dev/pci/if_dge.c:1.39 src/sys/dev/pci/if_dge.c:1.40
--- src/sys/dev/pci/if_dge.c:1.39	Sun Jan 11 04:19:18 2015
+++ src/sys/dev/pci/if_dge.c	Mon Apr 13 16:33:25 2015
@@ -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
 #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>

Index: src/sys/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.281 src/sys/dev/pci/if_bge.c:1.282
--- src/sys/dev/pci/if_bge.c:1.281	Mon Apr  6 07:38:17 2015
+++ src/sys/dev/pci/if_bge.c	Mon Apr 13 16:33:25 2015
@@ -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
 #include <net/if_media.h>
 #include <net/if_ether.h>
 
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
 
 #ifdef INET
 #include <netinet/in.h>

Index: src/sys/dev/pci/if_cas.c
diff -u src/sys/dev/pci/if_cas.c:1.22 src/sys/dev/pci/if_cas.c:1.23
--- src/sys/dev/pci/if_cas.c:1.22	Sun Aug 10 16:44:36 2014
+++ src/sys/dev/pci/if_cas.c	Mon Apr 13 16:33:25 2015
@@ -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
 
 #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>
Index: src/sys/dev/pci/ld_amr.c
diff -u src/sys/dev/pci/ld_amr.c:1.22 src/sys/dev/pci/ld_amr.c:1.23
--- src/sys/dev/pci/ld_amr.c:1.22	Mon Mar  2 15:26:57 2015
+++ src/sys/dev/pci/ld_amr.c	Mon Apr 13 16:33:25 2015
@@ -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
 #include <sys/endian.h>
 #include <sys/dkio.h>
 #include <sys/disk.h>
-#include <sys/rnd.h>
 
 #include <sys/bus.h>
 

Index: src/sys/dev/pci/if_devar.h
diff -u src/sys/dev/pci/if_devar.h:1.58 src/sys/dev/pci/if_devar.h:1.59
--- src/sys/dev/pci/if_devar.h:1.58	Sat Oct 27 17:18:32 2012
+++ src/sys/dev/pci/if_devar.h	Mon Apr 13 16:33:25 2015
@@ -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 (m...@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
Index: src/sys/dev/pci/if_pcn.c
diff -u src/sys/dev/pci/if_pcn.c:1.58 src/sys/dev/pci/if_pcn.c:1.59
--- src/sys/dev/pci/if_pcn.c:1.58	Sun Aug 10 16:44:36 2014
+++ src/sys/dev/pci/if_pcn.c	Mon Apr 13 16:33:25 2015
@@ -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
 #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>

Index: src/sys/dev/pci/if_fxp_pci.c
diff -u src/sys/dev/pci/if_fxp_pci.c:1.81 src/sys/dev/pci/if_fxp_pci.c:1.82
--- src/sys/dev/pci/if_fxp_pci.c:1.81	Sat Mar 29 19:28:24 2014
+++ src/sys/dev/pci/if_fxp_pci.c	Mon Apr 13 16:33:25 2015
@@ -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
 #include <sys/errno.h>
 #include <sys/device.h>
 
-#include <sys/rnd.h>
-
 #include <machine/endian.h>
 
 #include <net/if.h>

Index: src/sys/dev/pci/if_jme.c
diff -u src/sys/dev/pci/if_jme.c:1.26 src/sys/dev/pci/if_jme.c:1.27
--- src/sys/dev/pci/if_jme.c:1.26	Sun Aug 10 16:44:36 2014
+++ src/sys/dev/pci/if_jme.c	Mon Apr 13 16:33:25 2015
@@ -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
 #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>

Index: src/sys/dev/pci/if_msk.c
diff -u src/sys/dev/pci/if_msk.c:1.47 src/sys/dev/pci/if_msk.c:1.48
--- src/sys/dev/pci/if_msk.c:1.47	Fri Oct 10 14:23:06 2014
+++ src/sys/dev/pci/if_msk.c	Mon Apr 13 16:33:25 2015
@@ -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
 #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>

Index: src/sys/dev/pci/if_mskvar.h
diff -u src/sys/dev/pci/if_mskvar.h:1.11 src/sys/dev/pci/if_mskvar.h:1.12
--- src/sys/dev/pci/if_mskvar.h:1.11	Sun Oct 14 19:10:41 2012
+++ src/sys/dev/pci/if_mskvar.h	Mon Apr 13 16:33:25 2015
@@ -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;
Index: src/sys/dev/pci/if_vte.c
diff -u src/sys/dev/pci/if_vte.c:1.11 src/sys/dev/pci/if_vte.c:1.12
--- src/sys/dev/pci/if_vte.c:1.11	Sun Aug 10 16:44:36 2014
+++ src/sys/dev/pci/if_vte.c	Mon Apr 13 16:33:25 2015
@@ -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
 #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>

Index: src/sys/dev/pci/if_sip.c
diff -u src/sys/dev/pci/if_sip.c:1.158 src/sys/dev/pci/if_sip.c:1.159
--- src/sys/dev/pci/if_sip.c:1.158	Sun Aug 10 16:44:36 2014
+++ src/sys/dev/pci/if_sip.c	Mon Apr 13 16:33:25 2015
@@ -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
 #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>

Index: src/sys/dev/pci/if_sk.c
diff -u src/sys/dev/pci/if_sk.c:1.79 src/sys/dev/pci/if_sk.c:1.80
--- src/sys/dev/pci/if_sk.c:1.79	Wed Dec 10 00:15:26 2014
+++ src/sys/dev/pci/if_sk.c	Mon Apr 13 16:33:25 2015
@@ -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.
 #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>

Index: src/sys/dev/pci/if_tl.c
diff -u src/sys/dev/pci/if_tl.c:1.101 src/sys/dev/pci/if_tl.c:1.102
--- src/sys/dev/pci/if_tl.c:1.101	Sun Aug 10 16:44:36 2014
+++ src/sys/dev/pci/if_tl.c	Mon Apr 13 16:33:25 2015
@@ -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.
 #include <net/bpf.h>
 #include <net/bpfdesc.h>
 
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
 
 #ifdef INET
 #include <netinet/in.h>

Index: src/sys/dev/pci/if_tlvar.h
diff -u src/sys/dev/pci/if_tlvar.h:1.16 src/sys/dev/pci/if_tlvar.h:1.17
--- src/sys/dev/pci/if_tlvar.h:1.16	Thu Feb  2 19:43:05 2012
+++ src/sys/dev/pci/if_tlvar.h	Mon Apr 13 16:33:25 2015
@@ -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>
 
Index: src/sys/dev/pci/ld_twa.c
diff -u src/sys/dev/pci/ld_twa.c:1.16 src/sys/dev/pci/ld_twa.c:1.17
--- src/sys/dev/pci/ld_twa.c:1.16	Thu Oct 17 21:06:15 2013
+++ src/sys/dev/pci/ld_twa.c	Mon Apr 13 16:33:25 2015
@@ -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
 #include <sys/dkio.h>
 #include <sys/disk.h>
 #include <sys/proc.h>
-#include <sys/rnd.h>
 
 #include <sys/bus.h>
 

Index: src/sys/dev/pci/if_vr.c
diff -u src/sys/dev/pci/if_vr.c:1.114 src/sys/dev/pci/if_vr.c:1.115
--- src/sys/dev/pci/if_vr.c:1.114	Sun Aug 10 16:44:36 2014
+++ src/sys/dev/pci/if_vr.c	Mon Apr 13 16:33:25 2015
@@ -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.
 #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>

Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.314 src/sys/dev/pci/if_wm.c:1.315
--- src/sys/dev/pci/if_wm.c:1.314	Sat Mar 28 17:35:59 2015
+++ src/sys/dev/pci/if_wm.c	Mon Apr 13 16:33:25 2015
@@ -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.
 #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>

Index: src/sys/dev/pci/if_xge.c
diff -u src/sys/dev/pci/if_xge.c:1.19 src/sys/dev/pci/if_xge.c:1.20
--- src/sys/dev/pci/if_xge.c:1.19	Sat Mar 29 19:28:25 2014
+++ src/sys/dev/pci/if_xge.c	Mon Apr 13 16:33:25 2015
@@ -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
 #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>

Index: src/sys/dev/pci/ld_twe.c
diff -u src/sys/dev/pci/ld_twe.c:1.36 src/sys/dev/pci/ld_twe.c:1.37
--- src/sys/dev/pci/ld_twe.c:1.36	Thu Feb  2 19:43:06 2012
+++ src/sys/dev/pci/ld_twe.c	Mon Apr 13 16:33:25 2015
@@ -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
 #include <sys/dkio.h>
 #include <sys/disk.h>
 #include <sys/proc.h>
-#include <sys/rnd.h>
 
 #include <sys/bus.h>
 

Index: src/sys/dev/pci/ld_virtio.c
diff -u src/sys/dev/pci/ld_virtio.c:1.6 src/sys/dev/pci/ld_virtio.c:1.7
--- src/sys/dev/pci/ld_virtio.c:1.6	Tue Jul 22 01:55:54 2014
+++ src/sys/dev/pci/ld_virtio.c	Mon Apr 13 16:33:25 2015
@@ -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,
 #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>
Index: src/sys/dev/pci/viornd.c
diff -u src/sys/dev/pci/viornd.c:1.6 src/sys/dev/pci/viornd.c:1.7
--- src/sys/dev/pci/viornd.c:1.6	Wed Apr  8 13:47:06 2015
+++ src/sys/dev/pci/viornd.c	Mon Apr 13 16:33:25 2015
@@ -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>

Index: src/sys/dev/pci/n8/nsp.c
diff -u src/sys/dev/pci/n8/nsp.c:1.11 src/sys/dev/pci/n8/nsp.c:1.12
--- src/sys/dev/pci/n8/nsp.c:1.11	Sat Mar 29 19:28:25 2014
+++ src/sys/dev/pci/n8/nsp.c	Mon Apr 13 16:33:25 2015
@@ -82,7 +82,6 @@
 
 #include <opencrypto/cryptodev.h>
 #include <opencrypto/xform.h>
-#include <sys/rnd.h>
 #include <sys/md5.h>
 #include <sys/sha1.h>
 

Index: src/sys/dev/pci/n8/common/config.c
diff -u src/sys/dev/pci/n8/common/config.c:1.3 src/sys/dev/pci/n8/common/config.c:1.4
--- src/sys/dev/pci/n8/common/config.c:1.3	Sat Nov 13 13:52:09 2010
+++ src/sys/dev/pci/n8/common/config.c	Mon Apr 13 16:33:25 2015
@@ -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
 
 #include <opencrypto/cryptodev.h>
 #include <opencrypto/xform.h>
-#include <sys/rnd.h>
 #include <sys/md5.h>
 #include <sys/sha1.h>
 

Index: src/sys/dev/pcmcia/if_cs_pcmcia.c
diff -u src/sys/dev/pcmcia/if_cs_pcmcia.c:1.20 src/sys/dev/pcmcia/if_cs_pcmcia.c:1.21
--- src/sys/dev/pcmcia/if_cs_pcmcia.c:1.20	Sat Oct 27 17:18:36 2012
+++ src/sys/dev/pcmcia/if_cs_pcmcia.c	Mon Apr 13 16:33:25 2015
@@ -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
 #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>

Index: src/sys/dev/pcmcia/if_xivar.h
diff -u src/sys/dev/pcmcia/if_xivar.h:1.8 src/sys/dev/pcmcia/if_xivar.h:1.9
--- src/sys/dev/pcmcia/if_xivar.h:1.8	Thu Feb  2 19:43:06 2012
+++ src/sys/dev/pcmcia/if_xivar.h	Mon Apr 13 16:33:25 2015
@@ -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 */

Index: src/sys/dev/sbus/be.c
diff -u src/sys/dev/sbus/be.c:1.80 src/sys/dev/sbus/be.c:1.81
--- src/sys/dev/sbus/be.c:1.80	Sun Jun  9 09:23:35 2013
+++ src/sys/dev/sbus/be.c	Mon Apr 13 16:33:25 2015
@@ -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 
 #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>

Index: src/sys/dev/sbus/qe.c
diff -u src/sys/dev/sbus/qe.c:1.62 src/sys/dev/sbus/qe.c:1.63
--- src/sys/dev/sbus/qe.c:1.62	Sat Jun 23 17:21:12 2012
+++ src/sys/dev/sbus/qe.c	Mon Apr 13 16:33:25 2015
@@ -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 
 #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>

Index: src/sys/dev/scsipi/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.328 src/sys/dev/scsipi/cd.c:1.329
--- src/sys/dev/scsipi/cd.c:1.328	Fri Jan  2 19:42:07 2015
+++ src/sys/dev/scsipi/cd.c	Mon Apr 13 16:33:25 2015
@@ -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
 #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>

Index: src/sys/dev/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.314 src/sys/dev/scsipi/sd.c:1.315
--- src/sys/dev/scsipi/sd.c:1.314	Fri Jan  2 19:42:07 2015
+++ src/sys/dev/scsipi/sd.c	Mon Apr 13 16:33:25 2015
@@ -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
 #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>

Index: src/sys/dev/scsipi/sdvar.h
diff -u src/sys/dev/scsipi/sdvar.h:1.35 src/sys/dev/scsipi/sdvar.h:1.36
--- src/sys/dev/scsipi/sdvar.h:1.35	Fri Sep  5 05:30:23 2014
+++ src/sys/dev/scsipi/sdvar.h	Mon Apr 13 16:33:25 2015
@@ -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

Index: src/sys/dev/scsipi/stvar.h
diff -u src/sys/dev/scsipi/stvar.h:1.24 src/sys/dev/scsipi/stvar.h:1.25
--- src/sys/dev/scsipi/stvar.h:1.24	Tue Feb 28 10:58:11 2012
+++ src/sys/dev/scsipi/stvar.h	Mon Apr 13 16:33:25 2015
@@ -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 (mja...@nas.nasa.gov).
  */
 
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
 
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsiconf.h>

Index: src/sys/dev/sdmmc/ld_sdmmc.c
diff -u src/sys/dev/sdmmc/ld_sdmmc.c:1.14 src/sys/dev/sdmmc/ld_sdmmc.c:1.15
--- src/sys/dev/sdmmc/ld_sdmmc.c:1.14	Thu Oct  2 21:49:22 2014
+++ src/sys/dev/sdmmc/ld_sdmmc.c	Mon Apr 13 16:33:25 2015
@@ -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
 #include <sys/dkio.h>
 #include <sys/disk.h>
 #include <sys/kthread.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
 
 #include <dev/ldvar.h>
 

Index: src/sys/dev/sysmon/sysmon_envsys.c
diff -u src/sys/dev/sysmon/sysmon_envsys.c:1.129 src/sys/dev/sysmon/sysmon_envsys.c:1.130
--- src/sys/dev/sysmon/sysmon_envsys.c:1.129	Sat Mar 14 09:52:49 2015
+++ src/sys/dev/sysmon/sysmon_envsys.c	Mon Apr 13 16:33:25 2015
@@ -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_envsy
 #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>

Index: src/sys/dev/sysmon/sysmon_power.c
diff -u src/sys/dev/sysmon/sysmon_power.c:1.52 src/sys/dev/sysmon/sysmon_power.c:1.53
--- src/sys/dev/sysmon/sysmon_power.c:1.52	Sat Apr  4 15:31:17 2015
+++ src/sys/dev/sysmon/sysmon_power.c	Mon Apr 13 16:33:25 2015
@@ -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
 #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>

Index: src/sys/dev/sysmon/sysmonvar.h
diff -u src/sys/dev/sysmon/sysmonvar.h:1.46 src/sys/dev/sysmon/sysmonvar.h:1.47
--- src/sys/dev/sysmon/sysmonvar.h:1.46	Sat Mar 14 09:52:49 2015
+++ src/sys/dev/sysmon/sysmonvar.h	Mon Apr 13 16:33:25 2015
@@ -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;

Index: src/sys/dev/usb/if_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.132 src/sys/dev/usb/if_aue.c:1.133
--- src/sys/dev/usb/if_aue.c:1.132	Sun Aug 10 16:44:36 2014
+++ src/sys/dev/usb/if_aue.c	Mon Apr 13 16:33:25 2015
@@ -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
 #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>

Index: src/sys/dev/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.68 src/sys/dev/usb/if_axe.c:1.69
--- src/sys/dev/usb/if_axe.c:1.68	Wed Apr  8 12:38:13 2015
+++ src/sys/dev/usb/if_axe.c	Mon Apr 13 16:33:25 2015
@@ -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
 #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>
Index: src/sys/dev/usb/if_cue.c
diff -u src/sys/dev/usb/if_cue.c:1.68 src/sys/dev/usb/if_cue.c:1.69
--- src/sys/dev/usb/if_cue.c:1.68	Sun Aug 10 16:44:36 2014
+++ src/sys/dev/usb/if_cue.c	Mon Apr 13 16:33:25 2015
@@ -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 <wp...@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
 #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>

Index: src/sys/dev/usb/if_axen.c
diff -u src/sys/dev/usb/if_axen.c:1.5 src/sys/dev/usb/if_axen.c:1.6
--- src/sys/dev/usb/if_axen.c:1.5	Wed Apr  8 12:38:13 2015
+++ src/sys/dev/usb/if_axen.c	Mon Apr 13 16:33:25 2015
@@ -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 
 #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>

Index: src/sys/dev/usb/if_cdce.c
diff -u src/sys/dev/usb/if_cdce.c:1.38 src/sys/dev/usb/if_cdce.c:1.39
--- src/sys/dev/usb/if_cdce.c:1.38	Sat Jan  5 01:30:15 2013
+++ src/sys/dev/usb/if_cdce.c	Mon Apr 13 16:33:25 2015
@@ -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 <wp...@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 
 #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>

Index: src/sys/dev/usb/if_kue.c
diff -u src/sys/dev/usb/if_kue.c:1.81 src/sys/dev/usb/if_kue.c:1.82
--- src/sys/dev/usb/if_kue.c:1.81	Sun Aug 10 16:44:36 2014
+++ src/sys/dev/usb/if_kue.c	Mon Apr 13 16:33:25 2015
@@ -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
 #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>

Index: src/sys/dev/usb/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.22 src/sys/dev/usb/if_smsc.c:1.23
--- src/sys/dev/usb/if_smsc.c:1.22	Sat Sep 20 15:07:06 2014
+++ src/sys/dev/usb/if_smsc.c	Mon Apr 13 16:33:25 2015
@@ -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>

Index: src/sys/dev/usb/if_udav.c
diff -u src/sys/dev/usb/if_udav.c:1.43 src/sys/dev/usb/if_udav.c:1.44
--- src/sys/dev/usb/if_udav.c:1.43	Sun Aug 10 16:44:36 2014
+++ src/sys/dev/usb/if_udav.c	Mon Apr 13 16:33:25 2015
@@ -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 
 #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>

Index: src/sys/dev/usb/if_upl.c
diff -u src/sys/dev/usb/if_upl.c:1.47 src/sys/dev/usb/if_upl.c:1.48
--- src/sys/dev/usb/if_upl.c:1.47	Sun Aug 10 16:44:36 2014
+++ src/sys/dev/usb/if_upl.c	Mon Apr 13 16:33:25 2015
@@ -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
 #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>

Index: src/sys/dev/usb/if_url.c
diff -u src/sys/dev/usb/if_url.c:1.48 src/sys/dev/usb/if_url.c:1.49
--- src/sys/dev/usb/if_url.c:1.48	Sun Aug 10 16:44:36 2014
+++ src/sys/dev/usb/if_url.c	Mon Apr 13 16:33:25 2015
@@ -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
 #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>

Index: src/sys/dev/usb/ucom.c
diff -u src/sys/dev/usb/ucom.c:1.108 src/sys/dev/usb/ucom.c:1.109
--- src/sys/dev/usb/ucom.c:1.108	Sat Nov 15 19:18:19 2014
+++ src/sys/dev/usb/ucom.c	Mon Apr 13 16:33:25 2015
@@ -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.1
 #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>
 

Index: src/sys/dev/usb/uhidev.c
diff -u src/sys/dev/usb/uhidev.c:1.63 src/sys/dev/usb/uhidev.c:1.64
--- src/sys/dev/usb/uhidev.c:1.63	Sat Mar  7 20:20:55 2015
+++ src/sys/dev/usb/uhidev.c	Mon Apr 13 16:33:25 2015
@@ -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
 #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>

Index: src/sys/dev/usb/uhidev.h
diff -u src/sys/dev/usb/uhidev.h:1.17 src/sys/dev/usb/uhidev.h:1.18
--- src/sys/dev/usb/uhidev.h:1.17	Sat Mar  7 20:20:55 2015
+++ src/sys/dev/usb/uhidev.h	Mon Apr 13 16:33:25 2015
@@ -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 */

CVS commit: src/sys/dev

Reply via email to