Module Name: src Committed By: riastradh Date: Mon Apr 13 21:18:43 UTC 2015
Modified Files: src/sys/arch/acorn26/ioc: arckbd.c src/sys/arch/acorn32/eb7500atx: if_cs.c src/sys/arch/alpha/sableio: fdc_sableio.c src/sys/arch/arm/allwinner: awin_eth.c src/sys/arch/arm/amlogic: amlogic_rng.c src/sys/arch/arm/at91: at91dbgu.c at91usart.c src/sys/arch/arm/broadcom: bcm2835_rng.c bcm53xx_rng.c src/sys/arch/arm/clps711x: clpscom.c src/sys/arch/arm/ep93xx: epcom.c src/sys/arch/arm/imx: if_enet.c imxuart.c src/sys/arch/arm/ixp12x0: ixp12x0_com.c src/sys/arch/arm/s3c2xx0: sscom.c src/sys/arch/arm/sa11x0: sa1111_kbc.c sa11x0_com.c src/sys/arch/arm/samsung: sscom.c src/sys/arch/arm/xscale: ixp425_if_npe.c src/sys/arch/arm/zynq: zynq_uart.c src/sys/arch/emips/ebus: ace_ebus.c flash_ebus.c if_le_ebus.c src/sys/arch/epoc32/windermere: wmcom.c src/sys/arch/evbarm/dev: plcom.c plcomvar.h src/sys/arch/evbarm/smdk2xx0: if_cs_smdk24x0.c src/sys/arch/evbppc/pmppc/dev: if_cs_mainbus.c src/sys/arch/hp300/dev: rd.c src/sys/arch/hppa/gsc: harmony.c src/sys/arch/macppc/dev: if_gm.c src/sys/arch/mips/alchemy/dev: if_aumac.c src/sys/arch/mips/atheros/dev: aevar.h src/sys/arch/mips/sibyte/dev: sbjcnvar.h sbscn.c sbscnvar.h src/sys/arch/next68k/dev: mb8795.c mb8795var.h src/sys/arch/playstation2/dev: if_smap.c src/sys/arch/prep/pnpbus: fdc_pnpbus.c src/sys/arch/sgimips/hpc: sqvar.h src/sys/arch/shark/ofw: if_cs_ofisa_machdep.c src/sys/arch/sun2/dev: if_ec.c src/sys/arch/x68k/dev: fd.c src/sys/arch/xen/xen: if_xennet_xenbus.c xbd_xenbus.c Log Message: MD rnd.h cleanups. Please let me know if I broke anything! To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/acorn26/ioc/arckbd.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/acorn32/eb7500atx/if_cs.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/alpha/sableio/fdc_sableio.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/allwinner/awin_eth.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/amlogic/amlogic_rng.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/at91/at91dbgu.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/at91/at91usart.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/broadcom/bcm2835_rng.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/broadcom/bcm53xx_rng.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/clps711x/clpscom.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/ep93xx/epcom.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/imx/if_enet.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/imx/imxuart.c cvs rdiff -u -r1.46 -r1.47 src/sys/arch/arm/ixp12x0/ixp12x0_com.c cvs rdiff -u -r1.46 -r1.47 src/sys/arch/arm/s3c2xx0/sscom.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/sa11x0/sa1111_kbc.c cvs rdiff -u -r1.54 -r1.55 src/sys/arch/arm/sa11x0/sa11x0_com.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/samsung/sscom.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/xscale/ixp425_if_npe.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/zynq/zynq_uart.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/emips/ebus/ace_ebus.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/emips/ebus/flash_ebus.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/emips/ebus/if_le_ebus.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/epoc32/windermere/wmcom.c cvs rdiff -u -r1.51 -r1.52 src/sys/arch/evbarm/dev/plcom.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/dev/plcomvar.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/pmppc/dev/if_cs_mainbus.c cvs rdiff -u -r1.100 -r1.101 src/sys/arch/hp300/dev/rd.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/gsc/harmony.c cvs rdiff -u -r1.44 -r1.45 src/sys/arch/macppc/dev/if_gm.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/mips/alchemy/dev/if_aumac.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/atheros/dev/aevar.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/sibyte/dev/sbjcnvar.h cvs rdiff -u -r1.40 -r1.41 src/sys/arch/mips/sibyte/dev/sbscn.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/sibyte/dev/sbscnvar.h cvs rdiff -u -r1.53 -r1.54 src/sys/arch/next68k/dev/mb8795.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/next68k/dev/mb8795var.h cvs rdiff -u -r1.17 -r1.18 src/sys/arch/playstation2/dev/if_smap.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/prep/pnpbus/fdc_pnpbus.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sgimips/hpc/sqvar.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/shark/ofw/if_cs_ofisa_machdep.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sun2/dev/if_ec.c cvs rdiff -u -r1.115 -r1.116 src/sys/arch/x68k/dev/fd.c cvs rdiff -u -r1.63 -r1.64 src/sys/arch/xen/xen/if_xennet_xenbus.c cvs rdiff -u -r1.69 -r1.70 src/sys/arch/xen/xen/xbd_xenbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/acorn26/ioc/arckbd.c diff -u src/sys/arch/acorn26/ioc/arckbd.c:1.23 src/sys/arch/acorn26/ioc/arckbd.c:1.24 --- src/sys/arch/acorn26/ioc/arckbd.c:1.23 Sun Aug 10 16:44:32 2014 +++ src/sys/arch/acorn26/ioc/arckbd.c Mon Apr 13 21:18:40 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: arckbd.c,v 1.23 2014/08/10 16:44:32 tls Exp $ */ +/* $NetBSD: arckbd.c,v 1.24 2015/04/13 21:18:40 riastradh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 Ben Harris * All rights reserved. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: arckbd.c,v 1.23 2014/08/10 16:44:32 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: arckbd.c,v 1.24 2015/04/13 21:18:40 riastradh Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -70,8 +70,7 @@ __KERNEL_RCSID(0, "$NetBSD: arckbd.c,v 1 #include "wskbd.h" #include "wsmouse.h" - -#include <sys/rnd.h> +#include <sys/rndsource.h> /* #define ARCKBD_DEBUG */ Index: src/sys/arch/acorn32/eb7500atx/if_cs.c diff -u src/sys/arch/acorn32/eb7500atx/if_cs.c:1.9 src/sys/arch/acorn32/eb7500atx/if_cs.c:1.10 --- src/sys/arch/acorn32/eb7500atx/if_cs.c:1.9 Thu May 10 10:27:10 2012 +++ src/sys/arch/acorn32/eb7500atx/if_cs.c Mon Apr 13 21:18:40 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_cs.c,v 1.9 2012/05/10 10:27:10 skrll Exp $ */ +/* $NetBSD: if_cs.c,v 1.10 2015/04/13 21:18:40 riastradh Exp $ */ /* * Copyright (c) 2004 Christopher Gilbert @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cs.c,v 1.9 2012/05/10 10:27:10 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cs.c,v 1.10 2015/04/13 21:18:40 riastradh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -66,9 +66,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs.c,v 1. #include <sys/device.h> #include <sys/bus.h> - -#include <sys/rnd.h> - #include <net/if.h> #include <net/if_ether.h> #include <net/if_media.h> Index: src/sys/arch/alpha/sableio/fdc_sableio.c diff -u src/sys/arch/alpha/sableio/fdc_sableio.c:1.14 src/sys/arch/alpha/sableio/fdc_sableio.c:1.15 --- src/sys/arch/alpha/sableio/fdc_sableio.c:1.14 Sat Mar 29 19:28:25 2014 +++ src/sys/arch/alpha/sableio/fdc_sableio.c Mon Apr 13 21:18:40 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: fdc_sableio.c,v 1.14 2014/03/29 19:28:25 christos Exp $ */ +/* $NetBSD: fdc_sableio.c,v 1.15 2015/04/13 21:18:40 riastradh Exp $ */ /*- * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. @@ -31,14 +31,13 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: fdc_sableio.c,v 1.14 2014/03/29 19:28:25 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fdc_sableio.c,v 1.15 2015/04/13 21:18:40 riastradh Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/callout.h> #include <sys/device.h> #include <sys/buf.h> -#include <sys/rnd.h> #include <sys/bus.h> #include <machine/intr.h> Index: src/sys/arch/arm/allwinner/awin_eth.c diff -u src/sys/arch/arm/allwinner/awin_eth.c:1.8 src/sys/arch/arm/allwinner/awin_eth.c:1.9 --- src/sys/arch/arm/allwinner/awin_eth.c:1.8 Sun Mar 15 13:15:26 2015 +++ src/sys/arch/arm/allwinner/awin_eth.c Mon Apr 13 21:18:40 2015 @@ -31,7 +31,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(1, "$NetBSD: awin_eth.c,v 1.8 2015/03/15 13:15:26 jmcneill Exp $"); +__KERNEL_RCSID(1, "$NetBSD: awin_eth.c,v 1.9 2015/04/13 21:18:40 riastradh Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -39,7 +39,7 @@ __KERNEL_RCSID(1, "$NetBSD: awin_eth.c,v #include <sys/intr.h> #include <sys/ioctl.h> #include <sys/mutex.h> -#include <sys/rnd.h> +#include <sys/rndsource.h> #include <sys/systm.h> #include <net/if.h> Index: src/sys/arch/arm/amlogic/amlogic_rng.c diff -u src/sys/arch/arm/amlogic/amlogic_rng.c:1.2 src/sys/arch/arm/amlogic/amlogic_rng.c:1.3 --- src/sys/arch/arm/amlogic/amlogic_rng.c:1.2 Fri Apr 3 14:02:06 2015 +++ src/sys/arch/arm/amlogic/amlogic_rng.c Mon Apr 13 21:18:40 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: amlogic_rng.c,v 1.2 2015/04/03 14:02:06 jmcneill Exp $ */ +/* $NetBSD: amlogic_rng.c,v 1.3 2015/04/13 21:18:40 riastradh Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca> @@ -29,7 +29,7 @@ #include "locators.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: amlogic_rng.c,v 1.2 2015/04/03 14:02:06 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: amlogic_rng.c,v 1.3 2015/04/13 21:18:40 riastradh Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -38,7 +38,8 @@ __KERNEL_RCSID(0, "$NetBSD: amlogic_rng. #include <sys/kernel.h> #include <sys/mutex.h> #include <sys/callout.h> -#include <sys/rnd.h> +#include <sys/rndpool.h> +#include <sys/rndsource.h> #include <arm/amlogic/amlogic_reg.h> #include <arm/amlogic/amlogic_var.h> Index: src/sys/arch/arm/at91/at91dbgu.c diff -u src/sys/arch/arm/at91/at91dbgu.c:1.13 src/sys/arch/arm/at91/at91dbgu.c:1.14 --- src/sys/arch/arm/at91/at91dbgu.c:1.13 Sat Nov 15 19:20:01 2014 +++ src/sys/arch/arm/at91/at91dbgu.c Mon Apr 13 21:18:40 2015 @@ -1,5 +1,5 @@ -/* $Id: at91dbgu.c,v 1.13 2014/11/15 19:20:01 christos Exp $ */ -/* $NetBSD: at91dbgu.c,v 1.13 2014/11/15 19:20:01 christos Exp $ */ +/* $Id: at91dbgu.c,v 1.14 2015/04/13 21:18:40 riastradh Exp $ */ +/* $NetBSD: at91dbgu.c,v 1.14 2015/04/13 21:18:40 riastradh Exp $ */ /* * @@ -83,14 +83,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.13 2014/11/15 19:20:01 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.14 2015/04/13 21:18:40 riastradh Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" #include "rnd.h" #ifdef RND_COM -#include <sys/rnd.h> +#include <sys/rndsource.h> #endif /* Index: src/sys/arch/arm/at91/at91usart.c diff -u src/sys/arch/arm/at91/at91usart.c:1.12 src/sys/arch/arm/at91/at91usart.c:1.13 --- src/sys/arch/arm/at91/at91usart.c:1.12 Sat Nov 15 19:20:01 2014 +++ src/sys/arch/arm/at91/at91usart.c Mon Apr 13 21:18:40 2015 @@ -1,5 +1,5 @@ -/* $Id: at91usart.c,v 1.12 2014/11/15 19:20:01 christos Exp $ */ -/* $NetBSD: at91usart.c,v 1.12 2014/11/15 19:20:01 christos Exp $ */ +/* $Id: at91usart.c,v 1.13 2015/04/13 21:18:40 riastradh Exp $ */ +/* $NetBSD: at91usart.c,v 1.13 2015/04/13 21:18:40 riastradh Exp $ */ /* * Copyright (c) 2007 Embedtronics Oy. All rights reserved. @@ -77,14 +77,13 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: at91usart.c,v 1.12 2014/11/15 19:20:01 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: at91usart.c,v 1.13 2015/04/13 21:18:40 riastradh Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" -#include "rnd.h" #ifdef RND_COM -#include <sys/rnd.h> +#include <sys/rndsource.h> #endif #ifdef NOTYET Index: src/sys/arch/arm/broadcom/bcm2835_rng.c diff -u src/sys/arch/arm/broadcom/bcm2835_rng.c:1.10 src/sys/arch/arm/broadcom/bcm2835_rng.c:1.11 --- src/sys/arch/arm/broadcom/bcm2835_rng.c:1.10 Sun Aug 10 16:44:33 2014 +++ src/sys/arch/arm/broadcom/bcm2835_rng.c Mon Apr 13 21:18:40 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm2835_rng.c,v 1.10 2014/08/10 16:44:33 tls Exp $ */ +/* $NetBSD: bcm2835_rng.c,v 1.11 2015/04/13 21:18:40 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,14 +30,15 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bcm2835_rng.c,v 1.10 2014/08/10 16:44:33 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcm2835_rng.c,v 1.11 2015/04/13 21:18:40 riastradh Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> #include <sys/kernel.h> #include <sys/bus.h> -#include <sys/rnd.h> +#include <sys/rndpool.h> +#include <sys/rndsource.h> #include <sys/atomic.h> #include <sys/intr.h> Index: src/sys/arch/arm/broadcom/bcm53xx_rng.c diff -u src/sys/arch/arm/broadcom/bcm53xx_rng.c:1.7 src/sys/arch/arm/broadcom/bcm53xx_rng.c:1.8 --- src/sys/arch/arm/broadcom/bcm53xx_rng.c:1.7 Sun Aug 10 16:44:33 2014 +++ src/sys/arch/arm/broadcom/bcm53xx_rng.c Mon Apr 13 21:18:40 2015 @@ -33,14 +33,14 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(1, "$NetBSD: bcm53xx_rng.c,v 1.7 2014/08/10 16:44:33 tls Exp $"); +__KERNEL_RCSID(1, "$NetBSD: bcm53xx_rng.c,v 1.8 2015/04/13 21:18:40 riastradh Exp $"); #include <sys/param.h> #include <sys/bus.h> #include <sys/callout.h> #include <sys/device.h> #include <sys/intr.h> -#include <sys/rnd.h> +#include <sys/rndsource.h> #include <sys/systm.h> #include <arm/broadcom/bcm53xx_reg.h> Index: src/sys/arch/arm/clps711x/clpscom.c diff -u src/sys/arch/arm/clps711x/clpscom.c:1.5 src/sys/arch/arm/clps711x/clpscom.c:1.6 --- src/sys/arch/arm/clps711x/clpscom.c:1.5 Sat Nov 15 19:20:01 2014 +++ src/sys/arch/arm/clps711x/clpscom.c Mon Apr 13 21:18:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: clpscom.c,v 1.5 2014/11/15 19:20:01 christos Exp $ */ +/* $NetBSD: clpscom.c,v 1.6 2015/04/13 21:18:41 riastradh Exp $ */ /* * Copyright (c) 2013 KIYOHARA Takashi * All rights reserved. @@ -25,7 +25,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clpscom.c,v 1.5 2014/11/15 19:20:01 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clpscom.c,v 1.6 2015/04/13 21:18:41 riastradh Exp $"); #include "rnd.h" @@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: clpscom.c,v #include <dev/cons.h> #ifdef RND_COM -#include <sys/rnd.h> +#include <sys/rndsource.h> #endif #include "ioconf.h" Index: src/sys/arch/arm/ep93xx/epcom.c diff -u src/sys/arch/arm/ep93xx/epcom.c:1.29 src/sys/arch/arm/ep93xx/epcom.c:1.30 --- src/sys/arch/arm/ep93xx/epcom.c:1.29 Sat Nov 15 19:20:01 2014 +++ src/sys/arch/arm/ep93xx/epcom.c Mon Apr 13 21:18:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: epcom.c,v 1.29 2014/11/15 19:20:01 christos Exp $ */ +/* $NetBSD: epcom.c,v 1.30 2015/04/13 21:18:41 riastradh Exp $ */ /* * Copyright (c) 1998, 1999, 2001, 2002, 2004 The NetBSD Foundation, Inc. * All rights reserved. @@ -73,15 +73,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: epcom.c,v 1.29 2014/11/15 19:20:01 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: epcom.c,v 1.30 2015/04/13 21:18:41 riastradh Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" #include "epcom.h" -#include "rnd.h" #ifdef RND_COM -#include <sys/rnd.h> +#include <sys/rndsource.h> #endif /* Index: src/sys/arch/arm/imx/if_enet.c diff -u src/sys/arch/arm/imx/if_enet.c:1.2 src/sys/arch/arm/imx/if_enet.c:1.3 --- src/sys/arch/arm/imx/if_enet.c:1.2 Sun Mar 15 04:12:07 2015 +++ src/sys/arch/arm/imx/if_enet.c Mon Apr 13 21:18:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_enet.c,v 1.2 2015/03/15 04:12:07 ryo Exp $ */ +/* $NetBSD: if_enet.c,v 1.3 2015/04/13 21:18:41 riastradh Exp $ */ /* * Copyright (c) 2014 Ryo Shimizu <r...@nerv.org> @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.2 2015/03/15 04:12:07 ryo Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.3 2015/04/13 21:18:41 riastradh Exp $"); #include "imxocotp.h" #include "imxccm.h" @@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_enet.c,v #include <sys/device.h> #include <sys/sockio.h> #include <sys/kernel.h> -#include <sys/rnd.h> +#include <sys/rndsource.h> #include <lib/libkern/libkern.h> Index: src/sys/arch/arm/imx/imxuart.c diff -u src/sys/arch/arm/imx/imxuart.c:1.16 src/sys/arch/arm/imx/imxuart.c:1.17 --- src/sys/arch/arm/imx/imxuart.c:1.16 Sat Nov 15 19:20:01 2014 +++ src/sys/arch/arm/imx/imxuart.c Mon Apr 13 21:18:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: imxuart.c,v 1.16 2014/11/15 19:20:01 christos Exp $ */ +/* $NetBSD: imxuart.c,v 1.17 2015/04/13 21:18:41 riastradh Exp $ */ /* * Copyright (c) 2009, 2010 Genetec Corporation. All rights reserved. @@ -96,7 +96,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: imxuart.c,v 1.16 2014/11/15 19:20:01 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imxuart.c,v 1.17 2015/04/13 21:18:41 riastradh Exp $"); #include "opt_imxuart.h" #include "opt_ddb.h" @@ -108,9 +108,8 @@ __KERNEL_RCSID(0, "$NetBSD: imxuart.c,v #include "opt_imxuart.h" #include "opt_imx.h" -#include "rnd.h" #ifdef RND_COM -#include <sys/rnd.h> +#include <sys/rndsource.h> #endif #ifndef IMXUART_TOLERANCE Index: src/sys/arch/arm/ixp12x0/ixp12x0_com.c diff -u src/sys/arch/arm/ixp12x0/ixp12x0_com.c:1.46 src/sys/arch/arm/ixp12x0/ixp12x0_com.c:1.47 --- src/sys/arch/arm/ixp12x0/ixp12x0_com.c:1.46 Sat Nov 15 19:20:01 2014 +++ src/sys/arch/arm/ixp12x0/ixp12x0_com.c Mon Apr 13 21:18:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp12x0_com.c,v 1.46 2014/11/15 19:20:01 christos Exp $ */ +/* $NetBSD: ixp12x0_com.c,v 1.47 2015/04/13 21:18:41 riastradh Exp $ */ /* * Copyright (c) 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc. * All rights reserved. @@ -66,14 +66,13 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixp12x0_com.c,v 1.46 2014/11/15 19:20:01 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp12x0_com.c,v 1.47 2015/04/13 21:18:41 riastradh Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" -#include "rnd.h" #ifdef RND_COM -#include <sys/rnd.h> +#include <sys/rndsource.h> #endif #include <sys/param.h> Index: src/sys/arch/arm/s3c2xx0/sscom.c diff -u src/sys/arch/arm/s3c2xx0/sscom.c:1.46 src/sys/arch/arm/s3c2xx0/sscom.c:1.47 --- src/sys/arch/arm/s3c2xx0/sscom.c:1.46 Sun Aug 10 16:44:33 2014 +++ src/sys/arch/arm/s3c2xx0/sscom.c Mon Apr 13 21:18:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: sscom.c,v 1.46 2014/08/10 16:44:33 tls Exp $ */ +/* $NetBSD: sscom.c,v 1.47 2015/04/13 21:18:41 riastradh Exp $ */ /* * Copyright (c) 2002, 2003 Fujitsu Component Limited @@ -98,7 +98,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sscom.c,v 1.46 2014/08/10 16:44:33 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sscom.c,v 1.47 2015/04/13 21:18:41 riastradh Exp $"); #include "opt_sscom.h" #include "opt_ddb.h" @@ -106,9 +106,8 @@ __KERNEL_RCSID(0, "$NetBSD: sscom.c,v 1. #include "opt_multiprocessor.h" #include "opt_lockdebug.h" -#include "rnd.h" #ifdef RND_COM -#include <sys/rnd.h> +#include <sys/rndsource.h> #endif /* Index: src/sys/arch/arm/sa11x0/sa1111_kbc.c diff -u src/sys/arch/arm/sa11x0/sa1111_kbc.c:1.17 src/sys/arch/arm/sa11x0/sa1111_kbc.c:1.18 --- src/sys/arch/arm/sa11x0/sa1111_kbc.c:1.17 Sun Aug 10 16:44:33 2014 +++ src/sys/arch/arm/sa11x0/sa1111_kbc.c Mon Apr 13 21:18:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: sa1111_kbc.c,v 1.17 2014/08/10 16:44:33 tls Exp $ */ +/* $NetBSD: sa1111_kbc.c,v 1.18 2015/04/13 21:18:41 riastradh Exp $ */ /* * Copyright (c) 2004 Ben Harris. @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sa1111_kbc.c,v 1.17 2014/08/10 16:44:33 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sa1111_kbc.c,v 1.18 2015/04/13 21:18:41 riastradh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -71,7 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: sa1111_kbc.c #include <sys/errno.h> #include <sys/queue.h> #include <sys/bus.h> -#include <sys/rnd.h> +#include <sys/rndsource.h> #include <arm/sa11x0/sa1111_reg.h> #include <arm/sa11x0/sa1111_var.h> Index: src/sys/arch/arm/sa11x0/sa11x0_com.c diff -u src/sys/arch/arm/sa11x0/sa11x0_com.c:1.54 src/sys/arch/arm/sa11x0/sa11x0_com.c:1.55 --- src/sys/arch/arm/sa11x0/sa11x0_com.c:1.54 Sat Nov 15 19:20:01 2014 +++ src/sys/arch/arm/sa11x0/sa11x0_com.c Mon Apr 13 21:18:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: sa11x0_com.c,v 1.54 2014/11/15 19:20:01 christos Exp $ */ +/* $NetBSD: sa11x0_com.c,v 1.55 2015/04/13 21:18:41 riastradh Exp $ */ /*- * Copyright (c) 1998, 1999, 2001 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sa11x0_com.c,v 1.54 2014/11/15 19:20:01 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sa11x0_com.c,v 1.55 2015/04/13 21:18:41 riastradh Exp $"); #include "opt_com.h" #include "opt_ddb.h" @@ -73,9 +73,8 @@ __KERNEL_RCSID(0, "$NetBSD: sa11x0_com.c #include "opt_multiprocessor.h" #include "opt_lockdebug.h" -#include "rnd.h" #ifdef RND_COM -#include <sys/rnd.h> +#include <sys/rndsource.h> #endif #include <sys/param.h> Index: src/sys/arch/arm/samsung/sscom.c diff -u src/sys/arch/arm/samsung/sscom.c:1.7 src/sys/arch/arm/samsung/sscom.c:1.8 --- src/sys/arch/arm/samsung/sscom.c:1.7 Thu Oct 2 09:03:43 2014 +++ src/sys/arch/arm/samsung/sscom.c Mon Apr 13 21:18:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: sscom.c,v 1.7 2014/10/02 09:03:43 skrll Exp $ */ +/* $NetBSD: sscom.c,v 1.8 2015/04/13 21:18:41 riastradh Exp $ */ /* * Copyright (c) 2002, 2003 Fujitsu Component Limited @@ -98,7 +98,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sscom.c,v 1.7 2014/10/02 09:03:43 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sscom.c,v 1.8 2015/04/13 21:18:41 riastradh Exp $"); #include "opt_sscom.h" #include "opt_ddb.h" @@ -106,9 +106,8 @@ __KERNEL_RCSID(0, "$NetBSD: sscom.c,v 1. #include "opt_multiprocessor.h" #include "opt_lockdebug.h" -#include "rnd.h" #ifdef RND_COM -#include <sys/rnd.h> +#include <sys/rndsource.h> #endif /* Index: src/sys/arch/arm/xscale/ixp425_if_npe.c diff -u src/sys/arch/arm/xscale/ixp425_if_npe.c:1.27 src/sys/arch/arm/xscale/ixp425_if_npe.c:1.28 --- src/sys/arch/arm/xscale/ixp425_if_npe.c:1.27 Sat Oct 18 08:33:24 2014 +++ src/sys/arch/arm/xscale/ixp425_if_npe.c Mon Apr 13 21:18:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425_if_npe.c,v 1.27 2014/10/18 08:33:24 snj Exp $ */ +/* $NetBSD: ixp425_if_npe.c,v 1.28 2015/04/13 21:18:41 riastradh Exp $ */ /*- * Copyright (c) 2006 Sam Leffler. All rights reserved. @@ -28,7 +28,7 @@ #if 0 __FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.1 2006/11/19 23:55:23 sam Exp $"); #endif -__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.27 2014/10/18 08:33:24 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.28 2015/04/13 21:18:41 riastradh Exp $"); /* * Intel XScale NPE Ethernet driver. @@ -68,7 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp425_if_np #include <net/bpf.h> -#include <sys/rnd.h> +#include <sys/rndsource.h> #include <arm/xscale/ixp425reg.h> #include <arm/xscale/ixp425var.h> Index: src/sys/arch/arm/zynq/zynq_uart.c diff -u src/sys/arch/arm/zynq/zynq_uart.c:1.1 src/sys/arch/arm/zynq/zynq_uart.c:1.2 --- src/sys/arch/arm/zynq/zynq_uart.c:1.1 Fri Jan 23 12:34:09 2015 +++ src/sys/arch/arm/zynq/zynq_uart.c Mon Apr 13 21:18:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: zynq_uart.c,v 1.1 2015/01/23 12:34:09 hkenken Exp $ */ +/* $NetBSD: zynq_uart.c,v 1.2 2015/04/13 21:18:41 riastradh Exp $ */ /* * Copyright (c) 2012 Genetec Corporation. All rights reserved. @@ -96,7 +96,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zynq_uart.c,v 1.1 2015/01/23 12:34:09 hkenken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zynq_uart.c,v 1.2 2015/04/13 21:18:41 riastradh Exp $"); #include "opt_zynq.h" #include "opt_zynquart.h" @@ -108,8 +108,6 @@ __KERNEL_RCSID(0, "$NetBSD: zynq_uart.c, #include "opt_multiprocessor.h" #include "opt_ntp.h" -#include "rnd.h" - /* * Override cnmagic(9) macro before including <sys/systm.h>. * We need to know if cn_check_magic triggered debugger, so set a flag. @@ -141,7 +139,7 @@ __KERNEL_RCSID(0, "$NetBSD: zynq_uart.c, #include <sys/kauth.h> #include <sys/intr.h> #ifdef RND_COM -#include <sys/rnd.h> +#include <sys/rndsource.h> #endif #include <sys/bus.h> Index: src/sys/arch/emips/ebus/ace_ebus.c diff -u src/sys/arch/emips/ebus/ace_ebus.c:1.17 src/sys/arch/emips/ebus/ace_ebus.c:1.18 --- src/sys/arch/emips/ebus/ace_ebus.c:1.17 Fri Jan 2 19:42:05 2015 +++ src/sys/arch/emips/ebus/ace_ebus.c Mon Apr 13 21:18:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ace_ebus.c,v 1.17 2015/01/02 19:42:05 christos Exp $ */ +/* $NetBSD: ace_ebus.c,v 1.18 2015/04/13 21:18:41 riastradh Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.17 2015/01/02 19:42:05 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.18 2015/04/13 21:18:41 riastradh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v #include <sys/lock.h> #include <sys/queue.h> -#include <sys/rnd.h> +#include <sys/rndsource.h> #include <machine/intr.h> #include <machine/bus.h> Index: src/sys/arch/emips/ebus/flash_ebus.c diff -u src/sys/arch/emips/ebus/flash_ebus.c:1.15 src/sys/arch/emips/ebus/flash_ebus.c:1.16 --- src/sys/arch/emips/ebus/flash_ebus.c:1.15 Fri Jan 2 19:42:05 2015 +++ src/sys/arch/emips/ebus/flash_ebus.c Mon Apr 13 21:18:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: flash_ebus.c,v 1.15 2015/01/02 19:42:05 christos Exp $ */ +/* $NetBSD: flash_ebus.c,v 1.16 2015/04/13 21:18:41 riastradh Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.15 2015/01/02 19:42:05 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.16 2015/04/13 21:18:41 riastradh Exp $"); /* Driver for the Intel 28F320/640/128 (J3A150) StrataFlash memory device * Extended to include the Intel JS28F256P30T95. @@ -61,7 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: flash_ebus.c #include <sys/lock.h> #include <sys/queue.h> -#include <sys/rnd.h> +#include <sys/rndsource.h> #include "locators.h" #include <prop/proplib.h> Index: src/sys/arch/emips/ebus/if_le_ebus.c diff -u src/sys/arch/emips/ebus/if_le_ebus.c:1.6 src/sys/arch/emips/ebus/if_le_ebus.c:1.7 --- src/sys/arch/emips/ebus/if_le_ebus.c:1.6 Sun Aug 10 16:44:33 2014 +++ src/sys/arch/emips/ebus/if_le_ebus.c Mon Apr 13 21:18:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_ebus.c,v 1.6 2014/08/10 16:44:33 tls Exp $ */ +/* $NetBSD: if_le_ebus.c,v 1.7 2015/04/13 21:18:41 riastradh Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le_ebus.c,v 1.6 2014/08/10 16:44:33 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_ebus.c,v 1.7 2015/04/13 21:18:41 riastradh Exp $"); #include "opt_inet.h" @@ -60,7 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_ebus.c #include <net/bpf.h> #include <net/bpfdesc.h> -#include <sys/rnd.h> +#include <sys/rndsource.h> #include <emips/ebus/ebusvar.h> #include <emips/emips/machdep.h> Index: src/sys/arch/epoc32/windermere/wmcom.c diff -u src/sys/arch/epoc32/windermere/wmcom.c:1.5 src/sys/arch/epoc32/windermere/wmcom.c:1.6 --- src/sys/arch/epoc32/windermere/wmcom.c:1.5 Sat Nov 15 19:20:01 2014 +++ src/sys/arch/epoc32/windermere/wmcom.c Mon Apr 13 21:18:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: wmcom.c,v 1.5 2014/11/15 19:20:01 christos Exp $ */ +/* $NetBSD: wmcom.c,v 1.6 2015/04/13 21:18:41 riastradh Exp $ */ /* * Copyright (c) 2012 KIYOHARA Takashi * All rights reserved. @@ -25,7 +25,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wmcom.c,v 1.5 2014/11/15 19:20:01 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wmcom.c,v 1.6 2015/04/13 21:18:41 riastradh Exp $"); #include "rnd.h" @@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: wmcom.c,v 1. #include <dev/cons.h> #ifdef RND_COM -#include <sys/rnd.h> +#include <sys/rndsource.h> #endif #include "ioconf.h" Index: src/sys/arch/evbarm/dev/plcom.c diff -u src/sys/arch/evbarm/dev/plcom.c:1.51 src/sys/arch/evbarm/dev/plcom.c:1.52 --- src/sys/arch/evbarm/dev/plcom.c:1.51 Sat Nov 15 19:20:01 2014 +++ src/sys/arch/evbarm/dev/plcom.c Mon Apr 13 21:18:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: plcom.c,v 1.51 2014/11/15 19:20:01 christos Exp $ */ +/* $NetBSD: plcom.c,v 1.52 2015/04/13 21:18:41 riastradh Exp $ */ /*- * Copyright (c) 2001 ARM Ltd @@ -94,7 +94,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.51 2014/11/15 19:20:01 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.52 2015/04/13 21:18:41 riastradh Exp $"); #include "opt_plcom.h" #include "opt_ddb.h" @@ -102,8 +102,6 @@ __KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1. #include "opt_lockdebug.h" #include "opt_multiprocessor.h" -#include "rnd.h" - /* * Override cnmagic(9) macro before including <sys/systm.h>. * We need to know if cn_check_magic triggered debugger, so set a flag. @@ -136,7 +134,7 @@ __KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1. #include <sys/intr.h> #include <sys/bus.h> #ifdef RND_COM -#include <sys/rnd.h> +#include <sys/rndsource.h> #endif #include <evbarm/dev/plcomreg.h> Index: src/sys/arch/evbarm/dev/plcomvar.h diff -u src/sys/arch/evbarm/dev/plcomvar.h:1.15 src/sys/arch/evbarm/dev/plcomvar.h:1.16 --- src/sys/arch/evbarm/dev/plcomvar.h:1.15 Fri Feb 21 16:08:19 2014 +++ src/sys/arch/evbarm/dev/plcomvar.h Mon Apr 13 21:18:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: plcomvar.h,v 1.15 2014/02/21 16:08:19 skrll Exp $ */ +/* $NetBSD: plcomvar.h,v 1.16 2015/04/13 21:18:41 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_plcom.h" #include "opt_kgdb.h" #ifdef RND_COM -#include <sys/rnd.h> +#include <sys/rndsource.h> #endif #include <sys/callout.h> Index: src/sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c diff -u src/sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c:1.6 src/sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c:1.7 --- src/sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c:1.6 Mon Nov 12 18:00:39 2012 +++ src/sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c Mon Apr 13 21:18:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_cs_smdk24x0.c,v 1.6 2012/11/12 18:00:39 skrll Exp $ */ +/* $NetBSD: if_cs_smdk24x0.c,v 1.7 2015/04/13 21:18:41 riastradh Exp $ */ /* * Copyright (c) 2003 Genetec corporation. All rights reserved. @@ -72,15 +72,13 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cs_smdk24x0.c,v 1.6 2012/11/12 18:00:39 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cs_smdk24x0.c,v 1.7 2015/04/13 21:18:41 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/arch/evbppc/pmppc/dev/if_cs_mainbus.c diff -u src/sys/arch/evbppc/pmppc/dev/if_cs_mainbus.c:1.7 src/sys/arch/evbppc/pmppc/dev/if_cs_mainbus.c:1.8 --- src/sys/arch/evbppc/pmppc/dev/if_cs_mainbus.c:1.7 Thu Feb 2 19:42:59 2012 +++ src/sys/arch/evbppc/pmppc/dev/if_cs_mainbus.c Mon Apr 13 21:18:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_cs_mainbus.c,v 1.7 2012/02/02 19:42:59 tls Exp $ */ +/* $NetBSD: if_cs_mainbus.c,v 1.8 2015/04/13 21:18:42 riastradh Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cs_mainbus.c,v 1.7 2012/02/02 19:42:59 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cs_mainbus.c,v 1.8 2015/04/13 21:18:42 riastradh Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -38,8 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs_mainbu #include <sys/socket.h> #include <sys/bus.h> -#include <sys/rnd.h> - #include <net/if.h> #include <net/if_ether.h> #include <net/if_media.h> Index: src/sys/arch/hp300/dev/rd.c diff -u src/sys/arch/hp300/dev/rd.c:1.100 src/sys/arch/hp300/dev/rd.c:1.101 --- src/sys/arch/hp300/dev/rd.c:1.100 Fri Jan 2 19:42:05 2015 +++ src/sys/arch/hp300/dev/rd.c Mon Apr 13 21:18:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rd.c,v 1.100 2015/01/02 19:42:05 christos Exp $ */ +/* $NetBSD: rd.c,v 1.101 2015/04/13 21:18:42 riastradh Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.100 2015/01/02 19:42:05 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.101 2015/04/13 21:18:42 riastradh Exp $"); #include "opt_useleds.h" @@ -89,7 +89,7 @@ __KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.100 #include <sys/proc.h> #include <sys/stat.h> -#include <sys/rnd.h> +#include <sys/rndsource.h> #include <hp300/dev/hpibvar.h> Index: src/sys/arch/hppa/gsc/harmony.c diff -u src/sys/arch/hppa/gsc/harmony.c:1.2 src/sys/arch/hppa/gsc/harmony.c:1.3 --- src/sys/arch/hppa/gsc/harmony.c:1.2 Sun Aug 10 16:44:34 2014 +++ src/sys/arch/hppa/gsc/harmony.c Mon Apr 13 21:18:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: harmony.c,v 1.2 2014/08/10 16:44:34 tls Exp $ */ +/* $NetBSD: harmony.c,v 1.3 2015/04/13 21:18:42 riastradh Exp $ */ /* $OpenBSD: harmony.c,v 1.23 2004/02/13 21:28:19 mickey Exp $ */ @@ -73,7 +73,7 @@ #include <sys/kmem.h> #include <uvm/uvm_extern.h> -#include <sys/rnd.h> +#include <sys/rndsource.h> #include <sys/audioio.h> #include <dev/audio_if.h> Index: src/sys/arch/macppc/dev/if_gm.c diff -u src/sys/arch/macppc/dev/if_gm.c:1.44 src/sys/arch/macppc/dev/if_gm.c:1.45 --- src/sys/arch/macppc/dev/if_gm.c:1.44 Sun Aug 10 16:44:34 2014 +++ src/sys/arch/macppc/dev/if_gm.c Mon Apr 13 21:18:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_gm.c,v 1.44 2014/08/10 16:44:34 tls Exp $ */ +/* $NetBSD: if_gm.c,v 1.45 2015/04/13 21:18:42 riastradh Exp $ */ /*- * Copyright (c) 2000 Tsubai Masanari. All rights reserved. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_gm.c,v 1.44 2014/08/10 16:44:34 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_gm.c,v 1.45 2015/04/13 21:18:42 riastradh Exp $"); #include "opt_inet.h" @@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_gm.c,v 1. #include <sys/systm.h> #include <sys/callout.h> -#include <sys/rnd.h> +#include <sys/rndsource.h> #include <uvm/uvm_extern.h> Index: src/sys/arch/mips/alchemy/dev/if_aumac.c diff -u src/sys/arch/mips/alchemy/dev/if_aumac.c:1.38 src/sys/arch/mips/alchemy/dev/if_aumac.c:1.39 --- src/sys/arch/mips/alchemy/dev/if_aumac.c:1.38 Sun Aug 10 16:44:34 2014 +++ src/sys/arch/mips/alchemy/dev/if_aumac.c Mon Apr 13 21:18:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_aumac.c,v 1.38 2014/08/10 16:44:34 tls Exp $ */ +/* $NetBSD: if_aumac.c,v 1.39 2015/04/13 21:18:42 riastradh Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.38 2014/08/10 16:44:34 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.39 2015/04/13 21:18:42 riastradh Exp $"); @@ -71,7 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v #include <net/if_ether.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/arch/mips/atheros/dev/aevar.h diff -u src/sys/arch/mips/atheros/dev/aevar.h:1.6 src/sys/arch/mips/atheros/dev/aevar.h:1.7 --- src/sys/arch/mips/atheros/dev/aevar.h:1.6 Sat Oct 27 17:18:02 2012 +++ src/sys/arch/mips/atheros/dev/aevar.h Mon Apr 13 21:18:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: aevar.h,v 1.6 2012/10/27 17:18:02 chs Exp $ */ +/* $NetBSD: aevar.h,v 1.7 2015/04/13 21:18:42 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/arch/mips/sibyte/dev/sbjcnvar.h diff -u src/sys/arch/mips/sibyte/dev/sbjcnvar.h:1.5 src/sys/arch/mips/sibyte/dev/sbjcnvar.h:1.6 --- src/sys/arch/mips/sibyte/dev/sbjcnvar.h:1.5 Sat Nov 15 19:20:01 2014 +++ src/sys/arch/mips/sibyte/dev/sbjcnvar.h Mon Apr 13 21:18:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: sbjcnvar.h,v 1.5 2014/11/15 19:20:01 christos Exp $ */ +/* $NetBSD: sbjcnvar.h,v 1.6 2015/04/13 21:18:42 riastradh Exp $ */ /* * Copyright 2000, 2001 @@ -64,9 +64,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "rnd.h" #ifdef RND_SBJCN -#include <sys/rnd.h> +#include <sys/rndsource.h> #endif #include <sys/callout.h> Index: src/sys/arch/mips/sibyte/dev/sbscn.c diff -u src/sys/arch/mips/sibyte/dev/sbscn.c:1.40 src/sys/arch/mips/sibyte/dev/sbscn.c:1.41 --- src/sys/arch/mips/sibyte/dev/sbscn.c:1.40 Sun Aug 10 16:44:34 2014 +++ src/sys/arch/mips/sibyte/dev/sbscn.c Mon Apr 13 21:18:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: sbscn.c,v 1.40 2014/08/10 16:44:34 tls Exp $ */ +/* $NetBSD: sbscn.c,v 1.41 2015/04/13 21:18:42 riastradh Exp $ */ /* * Copyright 2000, 2001 @@ -109,16 +109,15 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sbscn.c,v 1.40 2014/08/10 16:44:34 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sbscn.c,v 1.41 2015/04/13 21:18:42 riastradh Exp $"); #define SBSCN_DEBUG #include "opt_ddb.h" #include "ioconf.h" -#include "rnd.h" #ifdef RND_SBSCN -#include <sys/rnd.h> +#include <sys/rndsource.h> #endif #include <sys/param.h> Index: src/sys/arch/mips/sibyte/dev/sbscnvar.h diff -u src/sys/arch/mips/sibyte/dev/sbscnvar.h:1.7 src/sys/arch/mips/sibyte/dev/sbscnvar.h:1.8 --- src/sys/arch/mips/sibyte/dev/sbscnvar.h:1.7 Sat Nov 15 19:20:01 2014 +++ src/sys/arch/mips/sibyte/dev/sbscnvar.h Mon Apr 13 21:18:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: sbscnvar.h,v 1.7 2014/11/15 19:20:01 christos Exp $ */ +/* $NetBSD: sbscnvar.h,v 1.8 2015/04/13 21:18:42 riastradh Exp $ */ /* * Copyright 2000, 2001 @@ -64,9 +64,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "rnd.h" #ifdef RND_SBSCN -#include <sys/rnd.h> +#include <sys/rndsource.h> #endif #include <sys/callout.h> Index: src/sys/arch/next68k/dev/mb8795.c diff -u src/sys/arch/next68k/dev/mb8795.c:1.53 src/sys/arch/next68k/dev/mb8795.c:1.54 --- src/sys/arch/next68k/dev/mb8795.c:1.53 Sun Aug 10 16:44:34 2014 +++ src/sys/arch/next68k/dev/mb8795.c Mon Apr 13 21:18:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: mb8795.c,v 1.53 2014/08/10 16:44:34 tls Exp $ */ +/* $NetBSD: mb8795.c,v 1.54 2015/04/13 21:18:42 riastradh Exp $ */ /* * Copyright (c) 1998 Darrin B. Jewell * All rights reserved. @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.53 2014/08/10 16:44:34 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.54 2015/04/13 21:18:42 riastradh Exp $"); #include "opt_inet.h" @@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: mb8795.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/arch/next68k/dev/mb8795var.h diff -u src/sys/arch/next68k/dev/mb8795var.h:1.14 src/sys/arch/next68k/dev/mb8795var.h:1.15 --- src/sys/arch/next68k/dev/mb8795var.h:1.14 Sat Oct 27 17:18:05 2012 +++ src/sys/arch/next68k/dev/mb8795var.h Mon Apr 13 21:18:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: mb8795var.h,v 1.14 2012/10/27 17:18:05 chs Exp $ */ +/* $NetBSD: mb8795var.h,v 1.15 2015/04/13 21:18:42 riastradh Exp $ */ /* * Copyright (c) 1998 Darrin B. Jewell * All rights reserved. @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/rnd.h> +#include <sys/rndsource.h> #define MB8795_NRXBUFS (32) Index: src/sys/arch/playstation2/dev/if_smap.c diff -u src/sys/arch/playstation2/dev/if_smap.c:1.17 src/sys/arch/playstation2/dev/if_smap.c:1.18 --- src/sys/arch/playstation2/dev/if_smap.c:1.17 Sun Aug 10 16:44:34 2014 +++ src/sys/arch/playstation2/dev/if_smap.c Mon Apr 13 21:18:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_smap.c,v 1.17 2014/08/10 16:44:34 tls Exp $ */ +/* $NetBSD: if_smap.c,v 1.18 2015/04/13 21:18:42 riastradh Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,12 +30,10 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_smap.c,v 1.17 2014/08/10 16:44:34 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_smap.c,v 1.18 2015/04/13 21:18:42 riastradh Exp $"); #include "debug_playstation2.h" -#include "rnd.h" - #include <sys/param.h> #include <sys/systm.h> @@ -46,9 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_smap.c,v #include <playstation2/ee/eevar.h> -#if NRND > 0 -#include <sys/rnd.h> -#endif +#include <sys/rndsource.h> #include <net/if.h> #include <net/if_dl.h> @@ -113,9 +109,7 @@ struct smap_softc { int tx_done_index, tx_start_index; int rx_done_index; -#if NRND > 0 - rndsource_element_t rnd_source; -#endif + krndsource_t rnd_source; }; #define DEVNAME (sc->emac3.dev.dv_xname) @@ -258,10 +252,8 @@ smap_attach(struct device *parent, struc spd_intr_establish(SPD_NIC, smap_intr, sc); -#if NRND > 0 rnd_attach_source(&sc->rnd_source, DEVNAME, RND_TYPE_NET, RND_FLAG_DEFAULT); -#endif } int @@ -334,9 +326,7 @@ smap_intr(void *arg) ifp = &sc->ethercom.ec_if; if (IFQ_IS_EMPTY(&ifp->if_snd) == 0) smap_start(ifp); -#if NRND > 0 rnd_add_uint32(&sc->rnd_source, cause | sc->tx_fifo_ptr << 16); -#endif return (1); } Index: src/sys/arch/prep/pnpbus/fdc_pnpbus.c diff -u src/sys/arch/prep/pnpbus/fdc_pnpbus.c:1.4 src/sys/arch/prep/pnpbus/fdc_pnpbus.c:1.5 --- src/sys/arch/prep/pnpbus/fdc_pnpbus.c:1.4 Thu Feb 2 19:43:00 2012 +++ src/sys/arch/prep/pnpbus/fdc_pnpbus.c Mon Apr 13 21:18:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: fdc_pnpbus.c,v 1.4 2012/02/02 19:43:00 tls Exp $ */ +/* $NetBSD: fdc_pnpbus.c,v 1.5 2015/04/13 21:18:42 riastradh Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fdc_pnpbus.c,v 1.4 2012/02/02 19:43:00 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fdc_pnpbus.c,v 1.5 2015/04/13 21:18:42 riastradh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -42,7 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: fdc_pnpbus.c #include <sys/device.h> #include <sys/buf.h> #include <sys/queue.h> -#include <sys/rnd.h> #include <sys/bus.h> #include <machine/intr.h> Index: src/sys/arch/sgimips/hpc/sqvar.h diff -u src/sys/arch/sgimips/hpc/sqvar.h:1.14 src/sys/arch/sgimips/hpc/sqvar.h:1.15 --- src/sys/arch/sgimips/hpc/sqvar.h:1.14 Thu Feb 2 19:43:00 2012 +++ src/sys/arch/sgimips/hpc/sqvar.h Mon Apr 13 21:18:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: sqvar.h,v 1.14 2012/02/02 19:43:00 tls Exp $ */ +/* $NetBSD: sqvar.h,v 1.15 2015/04/13 21:18:42 riastradh Exp $ */ /* * Copyright (c) 2001 Rafal K. Boni @@ -33,7 +33,7 @@ #include <sys/queue.h> #include <sys/callout.h> -#include <sys/rnd.h> +#include <sys/rndsource.h> #include <sgimips/hpc/hpcvar.h> #include <sgimips/hpc/hpcreg.h> Index: src/sys/arch/shark/ofw/if_cs_ofisa_machdep.c diff -u src/sys/arch/shark/ofw/if_cs_ofisa_machdep.c:1.10 src/sys/arch/shark/ofw/if_cs_ofisa_machdep.c:1.11 --- src/sys/arch/shark/ofw/if_cs_ofisa_machdep.c:1.10 Sat Feb 4 19:08:03 2012 +++ src/sys/arch/shark/ofw/if_cs_ofisa_machdep.c Mon Apr 13 21:18:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_cs_ofisa_machdep.c,v 1.10 2012/02/04 19:08:03 christos Exp $ */ +/* $NetBSD: if_cs_ofisa_machdep.c,v 1.11 2015/04/13 21:18:42 riastradh Exp $ */ /* * Copyright 1998 @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa_machdep.c,v 1.10 2012/02/04 19:08:03 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa_machdep.c,v 1.11 2015/04/13 21:18:42 riastradh Exp $"); #include "opt_compat_old_ofw.h" @@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa_ #include <sys/malloc.h> #include <sys/socket.h> #include <sys/bus.h> -#include <sys/rnd.h> +#include <sys/rndsource.h> #include <net/if.h> #include <net/if_ether.h> Index: src/sys/arch/sun2/dev/if_ec.c diff -u src/sys/arch/sun2/dev/if_ec.c:1.21 src/sys/arch/sun2/dev/if_ec.c:1.22 --- src/sys/arch/sun2/dev/if_ec.c:1.21 Sun Aug 10 16:44:34 2014 +++ src/sys/arch/sun2/dev/if_ec.c Mon Apr 13 21:18:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ec.c,v 1.21 2014/08/10 16:44:34 tls Exp $ */ +/* $NetBSD: if_ec.c,v 1.22 2015/04/13 21:18:42 riastradh Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.21 2014/08/10 16:44:34 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.22 2015/04/13 21:18:42 riastradh Exp $"); #include "opt_inet.h" #include "opt_ns.h" @@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ec.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_dl.h> Index: src/sys/arch/x68k/dev/fd.c diff -u src/sys/arch/x68k/dev/fd.c:1.115 src/sys/arch/x68k/dev/fd.c:1.116 --- src/sys/arch/x68k/dev/fd.c:1.115 Fri Jan 2 19:42:06 2015 +++ src/sys/arch/x68k/dev/fd.c Mon Apr 13 21:18:43 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.115 2015/01/02 19:42:06 christos Exp $ */ +/* $NetBSD: fd.c,v 1.116 2015/04/13 21:18:43 riastradh Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.115 2015/01/02 19:42:06 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.116 2015/04/13 21:18:43 riastradh Exp $"); #include "opt_ddb.h" #include "opt_m68k_arch.h" @@ -89,7 +89,7 @@ __KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.115 #include <sys/queue.h> #include <sys/proc.h> #include <sys/fdio.h> -#include <sys/rnd.h> +#include <sys/rndsource.h> #include <dev/cons.h> Index: src/sys/arch/xen/xen/if_xennet_xenbus.c diff -u src/sys/arch/xen/xen/if_xennet_xenbus.c:1.63 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.64 --- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.63 Sun Aug 10 16:44:35 2014 +++ src/sys/arch/xen/xen/if_xennet_xenbus.c Mon Apr 13 21:18:40 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_xennet_xenbus.c,v 1.63 2014/08/10 16:44:35 tls Exp $ */ +/* $NetBSD: if_xennet_xenbus.c,v 1.64 2015/04/13 21:18:40 riastradh Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -85,7 +85,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.63 2014/08/10 16:44:35 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.64 2015/04/13 21:18:40 riastradh Exp $"); #include "opt_xen.h" #include "opt_nfs_boot.h" @@ -97,7 +97,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_xennet_xe #include <sys/proc.h> #include <sys/systm.h> #include <sys/intr.h> -#include <sys/rnd.h> +#include <sys/rndsource.h> #include <net/if.h> #include <net/if_dl.h> Index: src/sys/arch/xen/xen/xbd_xenbus.c diff -u src/sys/arch/xen/xen/xbd_xenbus.c:1.69 src/sys/arch/xen/xen/xbd_xenbus.c:1.70 --- src/sys/arch/xen/xen/xbd_xenbus.c:1.69 Fri Jan 2 19:42:06 2015 +++ src/sys/arch/xen/xen/xbd_xenbus.c Mon Apr 13 21:18:40 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: xbd_xenbus.c,v 1.69 2015/01/02 19:42:06 christos Exp $ */ +/* $NetBSD: xbd_xenbus.c,v 1.70 2015/04/13 21:18:40 riastradh Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.69 2015/01/02 19:42:06 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.70 2015/04/13 21:18:40 riastradh Exp $"); #include "opt_xen.h" @@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c #include <uvm/uvm.h> -#include <sys/rnd.h> +#include <sys/rndsource.h> #include <xen/hypervisor.h> #include <xen/evtchn.h>