diff options
| author | tls <tls@NetBSD.org> | 2012-02-02 19:42:57 +0000 |
|---|---|---|
| committer | tls <tls@NetBSD.org> | 2012-02-02 19:42:57 +0000 |
| commit | cc9ee3de3e25ef31d3a97dc35bedc36945e35d2a (patch) | |
| tree | 06a2889eb6b4b02bc8b8bba6b5cc3f9b1938d18b /sys/arch | |
| parent | f622122a62827e27b444c2f95632d61f73357ced (diff) | |
Entropy-pool implementation move and cleanup.
1) Move core entropy-pool code and source/sink/sample management code
to sys/kern from sys/dev.
2) Remove use of NRND as test for presence of entropy-pool code throughout
source tree.
3) Remove use of RND_ENABLED in device drivers as microoptimization to
avoid expensive operations on disabled entropy sources; make the
rnd_add calls do this directly so all callers benefit.
4) Fix bug in recent rnd_add_data()/rnd_add_uint32() changes that might
have lead to slight entropy overestimation for some sources.
5) Add new source types for environmental sensors, power sensors, VM
system events, and skew between clocks, with a sample implementation
for each.
ok releng to go in before the branch due to the difficulty of later
pullup (widespread #ifdef removal and moved files). Tested with release
builds on amd64 and evbarm and live testing on amd64.
Diffstat (limited to 'sys/arch')
53 files changed, 176 insertions, 366 deletions
diff --git a/sys/arch/acorn26/ioc/arckbd.c b/sys/arch/acorn26/ioc/arckbd.c index 98c5e867964..cec6b33fdbe 100644 --- a/sys/arch/acorn26/ioc/arckbd.c +++ b/sys/arch/acorn26/ioc/arckbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: arckbd.c,v 1.21 2011/11/19 22:51:18 tls Exp $ */ +/* $NetBSD: arckbd.c,v 1.22 2012/02/02 19:42:57 tls 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.21 2011/11/19 22:51:18 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: arckbd.c,v 1.22 2012/02/02 19:42:57 tls Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -70,10 +70,8 @@ __KERNEL_RCSID(0, "$NetBSD: arckbd.c,v 1.21 2011/11/19 22:51:18 tls Exp $"); #include "wskbd.h" #include "wsmouse.h" -#include "rnd.h" -#if NRND > 0 + #include <sys/rnd.h> -#endif /* #define ARCKBD_DEBUG */ @@ -138,9 +136,7 @@ struct arckbd_softc { struct evcnt sc_xev; struct irq_handler *sc_rirq; struct evcnt sc_rev; -#if NRND > 0 krndsource_t sc_rnd_source; -#endif }; #define AKF_WANTKBD 0x01 @@ -223,10 +219,8 @@ arckbd_attach(device_t parent, device_t self, void *aux) aprint_normal("\n"); -#if NRND > 0 rnd_attach_source(&sc->sc_rnd_source, device_xname(self), RND_TYPE_TTY, 0); -#endif wskbdargs.console = 1; /* XXX FIXME */ wskbdargs.keymap = &sc->sc_mapdata; @@ -460,13 +454,9 @@ arckbd_rint(void *cookie) static void arckbd_mousemoved(device_t self, int byte1, int byte2) { -#if NRND > 0 || NWSMOUSE > 0 struct arckbd_softc *sc = device_private(self); -#endif -#if NRND > 0 rnd_add_uint32(&sc->sc_rnd_source, byte1); -#endif #if NWSMOUSE > 0 if (sc->sc_wsmousedev != NULL) { int dx, dy; @@ -489,9 +479,7 @@ arckbd_keyupdown(device_t self, int byte1, int byte2) u_int type; int value; -#if NRND > 0 rnd_add_uint32(&sc->sc_rnd_source, byte1); -#endif if ((byte1 & 0x0f) == 7) { /* Mouse button event */ /* diff --git a/sys/arch/acorn32/eb7500atx/if_cs.c b/sys/arch/acorn32/eb7500atx/if_cs.c index c60d68131d0..6ff8067c190 100644 --- a/sys/arch/acorn32/eb7500atx/if_cs.c +++ b/sys/arch/acorn32/eb7500atx/if_cs.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_cs.c,v 1.7 2011/07/19 15:59:52 dyoung Exp $ */ +/* $NetBSD: if_cs.c,v 1.8 2012/02/02 19:42:57 tls Exp $ */ /* * Copyright (c) 2004 Christopher Gilbert @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cs.c,v 1.7 2011/07/19 15:59:52 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cs.c,v 1.8 2012/02/02 19:42:57 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -66,10 +66,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs.c,v 1.7 2011/07/19 15:59:52 dyoung Exp $"); #include <sys/device.h> #include <sys/bus.h> -#include "rnd.h" -#if NRND > 0 + #include <sys/rnd.h> -#endif #include <net/if.h> #include <net/if_ether.h> diff --git a/sys/arch/alpha/sableio/fdc_sableio.c b/sys/arch/alpha/sableio/fdc_sableio.c index 2cd69916d18..7df2f6e7830 100644 --- a/sys/arch/alpha/sableio/fdc_sableio.c +++ b/sys/arch/alpha/sableio/fdc_sableio.c @@ -1,4 +1,4 @@ -/* $NetBSD: fdc_sableio.c,v 1.11 2011/07/01 19:19:50 dyoung Exp $ */ +/* $NetBSD: fdc_sableio.c,v 1.12 2012/02/02 19:42:57 tls Exp $ */ /*- * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. @@ -31,16 +31,14 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: fdc_sableio.c,v 1.11 2011/07/01 19:19:50 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fdc_sableio.c,v 1.12 2012/02/02 19:42:57 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/callout.h> #include <sys/device.h> #include <sys/buf.h> -#if NRND > 0 #include <sys/rnd.h> -#endif #include <sys/bus.h> #include <machine/intr.h> diff --git a/sys/arch/arm/at91/at91dbgu.c b/sys/arch/arm/at91/at91dbgu.c index fa63c02576d..f05d8c75cae 100644 --- a/sys/arch/arm/at91/at91dbgu.c +++ b/sys/arch/arm/at91/at91dbgu.c @@ -1,5 +1,5 @@ -/* $Id: at91dbgu.c,v 1.7 2011/11/04 17:23:05 aymeric Exp $ */ -/* $NetBSD: at91dbgu.c,v 1.7 2011/11/04 17:23:05 aymeric Exp $ */ +/* $Id: at91dbgu.c,v 1.8 2012/02/02 19:42:57 tls Exp $ */ +/* $NetBSD: at91dbgu.c,v 1.8 2012/02/02 19:42:57 tls Exp $ */ /* * @@ -83,13 +83,13 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.7 2011/11/04 17:23:05 aymeric Exp $"); +__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.8 2012/02/02 19:42:57 tls Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" #include "rnd.h" -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM #include <sys/rnd.h> #endif @@ -277,7 +277,7 @@ at91dbgu_attach(device_t parent, device_t self, void *aux) sc->sc_si = softint_establish(SOFTINT_SERIAL, at91dbgu_soft, sc); -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), RND_TYPE_TTY, 0); #endif @@ -1138,7 +1138,7 @@ dbgu_intr(void* arg) /* Wake up the poller. */ softint_schedule(sc->sc_si); #if 0 -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM rnd_add_uint32(&sc->rnd_source, imr ^ sr ^ c); #endif #endif diff --git a/sys/arch/arm/at91/at91dbguvar.h b/sys/arch/arm/at91/at91dbguvar.h index 5e67c6247cc..6d9d2551c0c 100644 --- a/sys/arch/arm/at91/at91dbguvar.h +++ b/sys/arch/arm/at91/at91dbguvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: at91dbguvar.h,v 1.4 2011/11/19 22:51:19 tls Exp $ */ +/* $NetBSD: at91dbguvar.h,v 1.5 2012/02/02 19:42:57 tls Exp $ */ /*- * Copyright (c) 2007 Embedtronics Oy @@ -81,7 +81,7 @@ struct at91dbgu_softc { int (*disable)(struct at91dbgu_softc *); int enabled; -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM krndsource_t rnd_source; #endif }; diff --git a/sys/arch/arm/at91/at91usart.c b/sys/arch/arm/at91/at91usart.c index eac13785b64..f81f621708c 100644 --- a/sys/arch/arm/at91/at91usart.c +++ b/sys/arch/arm/at91/at91usart.c @@ -1,5 +1,5 @@ -/* $Id: at91usart.c,v 1.5 2011/07/01 19:31:17 dyoung Exp $ */ -/* $NetBSD: at91usart.c,v 1.5 2011/07/01 19:31:17 dyoung Exp $ */ +/* $Id: at91usart.c,v 1.6 2012/02/02 19:42:57 tls Exp $ */ +/* $NetBSD: at91usart.c,v 1.6 2012/02/02 19:42:57 tls Exp $ */ /* * Copyright (c) 2007 Embedtronics Oy. All rights reserved. @@ -77,13 +77,13 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: at91usart.c,v 1.5 2011/07/01 19:31:17 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: at91usart.c,v 1.6 2012/02/02 19:42:57 tls Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" #include "rnd.h" -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM #include <sys/rnd.h> #endif @@ -303,7 +303,7 @@ at91usart_attach_subr(struct at91usart_softc *sc, struct at91bus_attach_args *sa sc->sc_si = softint_establish(SOFTINT_SERIAL, at91usart_soft, sc); -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), RND_TYPE_TTY, 0); #endif diff --git a/sys/arch/arm/at91/at91usartvar.h b/sys/arch/arm/at91/at91usartvar.h index b6bb20df69b..0347d8313ff 100644 --- a/sys/arch/arm/at91/at91usartvar.h +++ b/sys/arch/arm/at91/at91usartvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: at91usartvar.h,v 1.4 2011/11/19 22:51:19 tls Exp $ */ +/* $NetBSD: at91usartvar.h,v 1.5 2012/02/02 19:42:57 tls Exp $ */ /*- * Copyright (c) 2007 Embedtronics Oy. All rights reserved. @@ -85,7 +85,7 @@ struct at91usart_softc { int (*disable)(struct at91usart_softc *); int enabled; -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM krndsource_t rnd_source; #endif }; diff --git a/sys/arch/arm/ep93xx/epcom.c b/sys/arch/arm/ep93xx/epcom.c index 8809c1248c1..ebc8723e5ba 100644 --- a/sys/arch/arm/ep93xx/epcom.c +++ b/sys/arch/arm/ep93xx/epcom.c @@ -1,4 +1,4 @@ -/* $NetBSD: epcom.c,v 1.21 2011/07/01 19:31:17 dyoung Exp $ */ +/* $NetBSD: epcom.c,v 1.22 2012/02/02 19:42:57 tls Exp $ */ /* * Copyright (c) 1998, 1999, 2001, 2002, 2004 The NetBSD Foundation, Inc. * All rights reserved. @@ -73,14 +73,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: epcom.c,v 1.21 2011/07/01 19:31:17 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: epcom.c,v 1.22 2012/02/02 19:42:57 tls Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" #include "epcom.h" #include "rnd.h" -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM #include <sys/rnd.h> #endif @@ -237,7 +237,7 @@ epcom_attach_subr(struct epcom_softc *sc) sc->sc_si = softint_establish(SOFTINT_SERIAL, epcomsoft, sc); -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM rnd_attach_source(&sc->rnd_source, sc->sc_dev.dv_xname, RND_TYPE_TTY, 0); #endif @@ -1132,7 +1132,7 @@ epcomintr(void* arg) softint_schedule(sc->sc_si); #if 0 /* XXX: broken */ -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM rnd_add_uint32(&sc->rnd_source, intr ^ flagr); #endif #endif diff --git a/sys/arch/arm/ep93xx/epcomvar.h b/sys/arch/arm/ep93xx/epcomvar.h index 5f628ee8161..cbf26a602b6 100644 --- a/sys/arch/arm/ep93xx/epcomvar.h +++ b/sys/arch/arm/ep93xx/epcomvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: epcomvar.h,v 1.5 2011/11/19 22:51:19 tls Exp $ */ +/* $NetBSD: epcomvar.h,v 1.6 2012/02/02 19:42:58 tls Exp $ */ /*- * Copyright (c) 2004 Jesse Off * @@ -82,7 +82,7 @@ struct epcom_softc { int (*disable)(struct epcom_softc *); int enabled; -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM krndsource_t rnd_source; #endif }; diff --git a/sys/arch/arm/imx/imxuart.c b/sys/arch/arm/imx/imxuart.c index 1d4abdd3971..e981eb16f1c 100644 --- a/sys/arch/arm/imx/imxuart.c +++ b/sys/arch/arm/imx/imxuart.c @@ -1,4 +1,4 @@ -/* $NetBSD: imxuart.c,v 1.8 2011/04/24 16:26:54 rmind Exp $ */ +/* $NetBSD: imxuart.c,v 1.9 2012/02/02 19:42:58 tls 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.8 2011/04/24 16:26:54 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imxuart.c,v 1.9 2012/02/02 19:42:58 tls Exp $"); #include "opt_imxuart.h" #include "opt_ddb.h" @@ -108,7 +108,7 @@ __KERNEL_RCSID(0, "$NetBSD: imxuart.c,v 1.8 2011/04/24 16:26:54 rmind Exp $"); #include "opt_imx.h" #include "rnd.h" -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM #include <sys/rnd.h> #endif @@ -493,7 +493,7 @@ imxuart_attach_common(device_t parent, device_t self, sc->sc_si = softint_establish(SOFTINT_SERIAL, imxusoft, sc); -#if NRND > 0 && defined(RND_IMXUART) +#ifdef RND_COM rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), RND_TYPE_TTY, 0); #endif @@ -647,7 +647,7 @@ imxuart_detach(device_t self, int flags) /* Unhook the soft interrupt handler. */ softint_disestablish(sc->sc_si); -#if NRND > 0 && defined(RND_IMXU) +#ifdef RND_COM /* Unhook the entropy source. */ rnd_detach_source(&sc->rnd_source); #endif @@ -1882,7 +1882,7 @@ imxuintr(void *arg) /* Wake up the poller. */ softint_schedule(sc->sc_si); -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM rnd_add_uint32(&sc->rnd_source, iir | lsr); #endif diff --git a/sys/arch/arm/ixp12x0/ixp12x0_com.c b/sys/arch/arm/ixp12x0/ixp12x0_com.c index b87b2fe2081..0a15a3a07fc 100644 --- a/sys/arch/arm/ixp12x0/ixp12x0_com.c +++ b/sys/arch/arm/ixp12x0/ixp12x0_com.c @@ -1,4 +1,4 @@ -/* $NetBSD: ixp12x0_com.c,v 1.39 2011/07/01 20:27:50 dyoung Exp $ */ +/* $NetBSD: ixp12x0_com.c,v 1.40 2012/02/02 19:42:58 tls Exp $ */ /* * Copyright (c) 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc. * All rights reserved. @@ -66,13 +66,13 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixp12x0_com.c,v 1.39 2011/07/01 20:27:50 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp12x0_com.c,v 1.40 2012/02/02 19:42:58 tls Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" #include "rnd.h" -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM #include <sys/rnd.h> #endif @@ -236,7 +236,7 @@ ixpcom_attach_subr(struct ixpcom_softc *sc) sc->sc_si = softint_establish(SOFTINT_SERIAL, ixpcomsoft, sc); -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM rnd_attach_source(&sc->rnd_source, sc->sc_dev.dv_xname, RND_TYPE_TTY, 0); #endif @@ -1173,7 +1173,7 @@ ixpcomintr(void* arg) /* Wake up the poller. */ softint_schedule(sc->sc_si); -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM rnd_add_uint32(&sc->rnd_source, iir | lsr); #endif return (1); diff --git a/sys/arch/arm/s3c2xx0/sscom.c b/sys/arch/arm/s3c2xx0/sscom.c index 8aed5edb680..cd409b8fce9 100644 --- a/sys/arch/arm/s3c2xx0/sscom.c +++ b/sys/arch/arm/s3c2xx0/sscom.c @@ -1,4 +1,4 @@ -/* $NetBSD: sscom.c,v 1.34 2012/01/30 03:28:33 nisimura Exp $ */ +/* $NetBSD: sscom.c,v 1.35 2012/02/02 19:42:58 tls Exp $ */ /* * Copyright (c) 2002, 2003 Fujitsu Component Limited @@ -98,7 +98,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sscom.c,v 1.34 2012/01/30 03:28:33 nisimura Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sscom.c,v 1.35 2012/02/02 19:42:58 tls Exp $"); #include "opt_sscom.h" #include "opt_ddb.h" @@ -107,7 +107,7 @@ __KERNEL_RCSID(0, "$NetBSD: sscom.c,v 1.34 2012/01/30 03:28:33 nisimura Exp $"); #include "opt_lockdebug.h" #include "rnd.h" -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM #include <sys/rnd.h> #endif @@ -494,10 +494,8 @@ sscom_attach_subr(struct sscom_softc *sc) sc->sc_si = softint_establish(SOFTINT_SERIAL, sscomsoft, sc); -#if NRND > 0 && defined(RND_COM) - rnd_attach_source(&sc->rnd_source, sc->sc_dev->dv_xname, + rnd_attach_source(&sc->rnd_source, sc->sc_dev.dv_xname, RND_TYPE_TTY, 0); -#endif /* if there are no enable/disable functions, assume the device is always enabled */ @@ -1727,7 +1725,7 @@ sscomrxintr(void *arg) /* Wake up the poller. */ softint_schedule(sc->sc_si); -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM rnd_add_uint32(&sc->rnd_source, iir | rsr); #endif @@ -1792,7 +1790,7 @@ sscomtxintr(void *arg) /* Wake up the poller. */ softint_schedule(sc->sc_si); -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM rnd_add_uint32(&sc->rnd_source, iir | rsr); #endif diff --git a/sys/arch/arm/s3c2xx0/sscom_var.h b/sys/arch/arm/s3c2xx0/sscom_var.h index dfc360409ed..6668ae9f597 100644 --- a/sys/arch/arm/s3c2xx0/sscom_var.h +++ b/sys/arch/arm/s3c2xx0/sscom_var.h @@ -1,4 +1,4 @@ -/* $NetBSD: sscom_var.h,v 1.10 2012/01/30 03:28:33 nisimura Exp $ */ +/* $NetBSD: sscom_var.h,v 1.11 2012/02/02 19:42:58 tls Exp $ */ /* * Copyright (c) 2002, 2003 Fujitsu Component Limited @@ -174,7 +174,7 @@ struct sscom_softc { pps_params_t ppsparam; #endif -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM krndsource_t rnd_source; #endif #if (defined(MULTIPROCESSOR) || defined(LOCKDEBUG)) && defined(SSCOM_MPLOCK) diff --git a/sys/arch/arm/sa11x0/sa1111_kbc.c b/sys/arch/arm/sa11x0/sa1111_kbc.c index c5485d99bef..95a55082138 100644 --- a/sys/arch/arm/sa11x0/sa1111_kbc.c +++ b/sys/arch/arm/sa11x0/sa1111_kbc.c @@ -1,4 +1,4 @@ -/* $NetBSD: sa1111_kbc.c,v 1.13 2011/11/19 22:51:19 tls Exp $ */ +/* $NetBSD: sa1111_kbc.c,v 1.14 2012/02/02 19:42:58 tls Exp $ */ /* * Copyright (c) 2004 Ben Harris. @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sa1111_kbc.c,v 1.13 2011/11/19 22:51:19 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sa1111_kbc.c,v 1.14 2012/02/02 19:42:58 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -71,6 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: sa1111_kbc.c,v 1.13 2011/11/19 22:51:19 tls Exp $"); #include <sys/errno.h> #include <sys/queue.h> #include <sys/bus.h> +#include <sys/rnd.h> #include <arm/sa11x0/sa1111_reg.h> #include <arm/sa11x0/sa1111_var.h> @@ -78,7 +79,6 @@ __KERNEL_RCSID(0, "$NetBSD: sa1111_kbc.c,v 1.13 2011/11/19 22:51:19 tls Exp $"); #include <dev/pckbport/pckbportvar.h> /* for prototypes */ #include "pckbd.h" -#include "rnd.h" #include "locators.h" struct sackbc_softc { @@ -95,9 +95,7 @@ struct sackbc_softc { int poll_stat; /* data read from inr handler if polling */ int poll_data; /* status read from intr handler if polling */ -#if NRND > 0 krndsource_t rnd_source; -#endif pckbport_tag_t pt; }; @@ -171,9 +169,7 @@ sackbc_rxint(void *cookie) if (stat & KBDSTAT_RXF) { code = bus_space_read_4(sc->iot, sc->ioh, SACCKBD_DATA); -#if NRND > 0 rnd_add_uint32(&sc->rnd_source, (stat<<8)|data); -#endif if (sc->polling) { sc->poll_data = code; @@ -279,10 +275,8 @@ sackbc_attach(device_t parent, device_t self, void *aux) if (child == NULL) continue; sc->slot = slot; -#if NRND > 0 rnd_attach_source(&sc->rnd_source, device_xname(child), RND_TYPE_TTY, 0); -#endif /* only one of KBD_SLOT or AUX_SLOT is used. */ break; } diff --git a/sys/arch/arm/sa11x0/sa11x0_com.c b/sys/arch/arm/sa11x0/sa11x0_com.c index 475a44b9908..eeba00c1ff5 100644 --- a/sys/arch/arm/sa11x0/sa11x0_com.c +++ b/sys/arch/arm/sa11x0/sa11x0_com.c @@ -1,4 +1,4 @@ -/* $NetBSD: sa11x0_com.c,v 1.49 2011/07/01 20:31:39 dyoung Exp $ */ +/* $NetBSD: sa11x0_com.c,v 1.50 2012/02/02 19:42:58 tls 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.49 2011/07/01 20:31:39 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sa11x0_com.c,v 1.50 2012/02/02 19:42:58 tls Exp $"); #include "opt_com.h" #include "opt_ddb.h" @@ -74,7 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: sa11x0_com.c,v 1.49 2011/07/01 20:31:39 dyoung Exp $ #include "opt_lockdebug.h" #include "rnd.h" -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM #include <sys/rnd.h> #endif @@ -330,7 +330,7 @@ sacom_attach_subr(struct sacom_softc *sc) sc->sc_si = softint_establish(SOFTINT_SERIAL, sacomsoft, sc); -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), RND_TYPE_TTY, 0); #endif @@ -380,7 +380,7 @@ sacom_detach(device_t dev, int flags) /* Unhook the soft interrupt handler. */ softint_disestablish(sc->sc_si); -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM /* Unhook the entropy source. */ rnd_detach_source(&sc->rnd_source); #endif @@ -1393,7 +1393,7 @@ sacomintr(void *arg) /* Wake up the poller. */ softint_schedule(sc->sc_si); -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM rnd_add_uint32(&sc->rnd_source, iir | lsr); #endif return 1; diff --git a/sys/arch/arm/xscale/ixp425_if_npe.c b/sys/arch/arm/xscale/ixp425_if_npe.c index ca98fe99d66..44708f7c054 100644 --- a/sys/arch/arm/xscale/ixp425_if_npe.c +++ b/sys/arch/arm/xscale/ixp425_if_npe.c @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425_if_npe.c,v 1.21 2011/11/19 22:51:19 tls Exp $ */ +/* $NetBSD: ixp425_if_npe.c,v 1.22 2012/02/02 19:42:58 tls 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.21 2011/11/19 22:51:19 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.22 2012/02/02 19:42:58 tls Exp $"); /* * Intel XScale NPE Ethernet driver. @@ -47,8 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.21 2011/11/19 22:51:19 tls Exp $ * XXX NPE-C port doesn't work yet */ -#include "rnd.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -70,9 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.21 2011/11/19 22:51:19 tls Exp $ #include <net/bpf.h> -#if NRND > 0 #include <sys/rnd.h> -#endif #include <arm/xscale/ixp425reg.h> #include <arm/xscale/ixp425var.h> @@ -126,9 +122,7 @@ struct npe_softc { bus_dmamap_t sc_stats_map; bus_addr_t sc_stats_phys; /* phys addr of sc_stats */ int sc_if_flags; /* keep last if_flags */ -#if NRND > 0 krndsource_t rnd_source; /* random source */ -#endif }; /* @@ -338,10 +332,8 @@ npe_attach(struct device *parent, struct device *self, void *arg) if_attach(ifp); ether_ifattach(ifp, sc->sc_enaddr); -#if NRND > 0 rnd_attach_source(&sc->rnd_source, sc->sc_dev.dv_xname, RND_TYPE_NET, 0); -#endif /* callback function to reset MAC */ isc->macresetcbfunc = npeinit_resetcb; @@ -838,10 +830,7 @@ npe_txdone(int qid, void *arg) sc = npes[NPE_QM_Q_NPE(entry)]; DPRINTF(sc, "%s: entry 0x%x NPE %u port %u\n", __func__, entry, NPE_QM_Q_NPE(entry), NPE_QM_Q_PORT(entry)); -#if NRND > 0 - if (RND_ENABLED(&sc->rnd_source)) - rnd_add_uint32(&sc->rnd_source, entry); -#endif + rnd_add_uint32(&sc->rnd_source, entry); npe = P2V(NPE_QM_Q_ADDR(entry), &sc->txdma); m_freem(npe->ix_m); @@ -931,10 +920,7 @@ npe_rxdone(int qid, void *arg) DPRINTF(sc, "%s: entry 0x%x neaddr 0x%x ne_len 0x%x\n", __func__, entry, npe->ix_neaddr, npe->ix_hw->ix_ne[0].len); -#if NRND > 0 - if (RND_ENABLED(&sc->rnd_source)) - rnd_add_uint32(&sc->rnd_source, entry); -#endif + rnd_add_uint32(&sc->rnd_source, entry); /* * Allocate a new mbuf to replenish the rx buffer. * If doing so fails we drop the rx'd frame so we diff --git a/sys/arch/emips/ebus/ace_ebus.c b/sys/arch/emips/ebus/ace_ebus.c index c050ce1f4e4..c9339587fbe 100644 --- a/sys/arch/emips/ebus/ace_ebus.c +++ b/sys/arch/emips/ebus/ace_ebus.c @@ -1,4 +1,4 @@ -/* $NetBSD: ace_ebus.c,v 1.3 2011/11/19 22:51:19 tls Exp $ */ +/* $NetBSD: ace_ebus.c,v 1.4 2012/02/02 19:42:58 tls Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -31,9 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.3 2011/11/19 22:51:19 tls Exp $"); - -#include "rnd.h" +__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.4 2012/02/02 19:42:58 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -56,9 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.3 2011/11/19 22:51:19 tls Exp $"); #include <sys/lock.h> #include <sys/queue.h> -#if NRND > 0 #include <sys/rnd.h> -#endif #include <machine/intr.h> #include <machine/bus.h> @@ -192,9 +188,7 @@ struct ace_softc { int hw_busy; int retries; /* number of xfer retry */ -#if NRND > 0 krndsource_t rnd_source; -#endif }; int ace_ebus_match(device_t, cfdata_t, void *); @@ -1467,7 +1461,7 @@ sysace_send_config(struct ace_softc *sc, uint32_t *Data, unsigned int nBytes) * Rest of code lifted with mods from the dev\ata\wd.c driver */ -/* $NetBSD: ace_ebus.c,v 1.3 2011/11/19 22:51:19 tls Exp $ */ +/* $NetBSD: ace_ebus.c,v 1.4 2012/02/02 19:42:58 tls Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. @@ -1644,10 +1638,8 @@ aceattach(struct ace_softc *ace) */ disk_attach(&ace->sc_dk); -#if NRND > 0 rnd_attach_source(&ace->rnd_source, device_xname(ace->sc_dev), RND_TYPE_DISK, 0); -#endif } @@ -1703,10 +1695,8 @@ acedetach(struct device *self, int flags) /* Detach disk. */ disk_detach(&sc->sc_dk); -#if NRND > 0 /* Unhook the entropy source. */ rnd_detach_source(&sc->rnd_source); -#endif #if 0 sc->drvp->drive_flags = 0; /* no drive any more here */ @@ -1901,9 +1891,7 @@ retry: /* Just reset and retry. Can we do more ? */ } disk_unbusy(&ace->sc_dk, (bp->b_bcount - bp->b_resid), (bp->b_flags & B_READ)); -#if NRND > 0 rnd_add_uint32(&ace->rnd_source, bp->b_blkno); -#endif biodone(bp); ace->openings++; acestart(ace); diff --git a/sys/arch/emips/ebus/flash_ebus.c b/sys/arch/emips/ebus/flash_ebus.c index a6c12c74108..ddab9dce4e8 100644 --- a/sys/arch/emips/ebus/flash_ebus.c +++ b/sys/arch/emips/ebus/flash_ebus.c @@ -1,4 +1,4 @@ -/* $NetBSD: flash_ebus.c,v 1.3 2011/11/19 22:51:19 tls Exp $ */ +/* $NetBSD: flash_ebus.c,v 1.4 2012/02/02 19:42:59 tls 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.3 2011/11/19 22:51:19 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.4 2012/02/02 19:42:59 tls Exp $"); /* Driver for the Intel 28F320/640/128 (J3A150) StrataFlash memory device * Extended to include the Intel JS28F256P30T95. @@ -61,9 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.3 2011/11/19 22:51:19 tls Exp $"); #include <sys/lock.h> #include <sys/queue.h> -#if NRND > 0 #include <sys/rnd.h> -#endif #include "locators.h" #include <prop/proplib.h> @@ -201,9 +199,7 @@ struct eflash_softc { int retries; /* number of xfer retry */ -#if NRND > 0 krndsource_t rnd_source; -#endif /* flash-specific state */ struct _Flash *sc_dp; @@ -1306,7 +1302,7 @@ static int eflash_write_at (struct eflash_softc *sc, /* Rest of code lifted with mods from the dev\ata\wd.c driver */ -/* $NetBSD: flash_ebus.c,v 1.3 2011/11/19 22:51:19 tls Exp $ */ +/* $NetBSD: flash_ebus.c,v 1.4 2012/02/02 19:42:59 tls Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. @@ -1458,10 +1454,8 @@ eflashattach(struct eflash_softc *sc) */ disk_attach(&sc->sc_dk); -#if NRND > 0 rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), RND_TYPE_DISK, 0); -#endif } @@ -1520,10 +1514,8 @@ eflashdetach(struct device *self, int flags) /* Detach disk. */ disk_detach(&sc->sc_dk); -#if NRND > 0 /* Unhook the entropy source. */ rnd_detach_source(&sc->rnd_source); -#endif /*sc->drvp->drive_flags = 0; -- no drive any more here */ @@ -1828,9 +1820,7 @@ retry: /* Just reset and retry. Can we do more ? */ } disk_unbusy(&sc->sc_dk, (bp->b_bcount - bp->b_resid), (bp->b_flags & B_READ)); -#if NRND > 0 rnd_add_uint32(&sc->rnd_source, bp->b_blkno); -#endif biodone(bp); sc->openings++; eflashstart(sc); diff --git a/sys/arch/emips/ebus/if_le_ebus.c b/sys/arch/emips/ebus/if_le_ebus.c index 85b5f5c50ca..320e7193d0e 100644 --- a/sys/arch/emips/ebus/if_le_ebus.c +++ b/sys/arch/emips/ebus/if_le_ebus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_ebus.c,v 1.3 2011/11/19 22:51:19 tls Exp $ */ +/* $NetBSD: if_le_ebus.c,v 1.4 2012/02/02 19:42:59 tls Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -31,11 +31,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le_ebus.c,v 1.3 2011/11/19 22:51:19 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_ebus.c,v 1.4 2012/02/02 19:42:59 tls Exp $"); #include "opt_inet.h" -#include "rnd.h" + #include <sys/param.h> #include <sys/systm.h> @@ -60,9 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_ebus.c,v 1.3 2011/11/19 22:51:19 tls Exp $"); #include <net/bpf.h> #include <net/bpfdesc.h> -#if NRND > 0 #include <sys/rnd.h> -#endif #include <emips/ebus/ebusvar.h> #include <emips/emips/machdep.h> @@ -114,9 +112,7 @@ struct enic_softc { uint8_t sc_enaddr[ETHER_ADDR_LEN]; uint8_t sc_pad[2]; -#if NRND > 0 krndsource_t rnd_source; -#endif }; void enic_reset(struct ifnet *); @@ -226,10 +222,8 @@ enic_attach(device_t parent, device_t self, void *aux) if (sc->sc_sh == NULL) panic("enic_attach: cannot establish shutdown hook"); -#if NRND > 0 rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), RND_TYPE_NET, 0); -#endif ebus_intr_establish(parent, (void *)ia->ia_cookie, IPL_NET, enic_intr, sc); @@ -708,9 +702,7 @@ enic_intr(void *cookie, void *f) isr = sc->sc_regs->Control; } -#if NRND > 0 rnd_add_uint32(&sc->rnd_source, isr); -#endif return 1; } diff --git a/sys/arch/evbarm/dev/plcom.c b/sys/arch/evbarm/dev/plcom.c index ad0104bd911..ee8e3181144 100644 --- a/sys/arch/evbarm/dev/plcom.c +++ b/sys/arch/evbarm/dev/plcom.c @@ -1,4 +1,4 @@ -/* $NetBSD: plcom.c,v 1.32 2011/04/24 16:26:55 rmind Exp $ */ +/* $NetBSD: plcom.c,v 1.33 2012/02/02 19:42:59 tls Exp $ */ /*- * Copyright (c) 2001 ARM Ltd @@ -94,7 +94,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.32 2011/04/24 16:26:55 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.33 2012/02/02 19:42:59 tls Exp $"); #include "opt_plcom.h" #include "opt_ddb.h" @@ -103,7 +103,7 @@ __KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.32 2011/04/24 16:26:55 rmind Exp $"); #include "opt_multiprocessor.h" #include "rnd.h" -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM #include <sys/rnd.h> #endif @@ -436,7 +436,7 @@ plcom_attach_subr(struct plcom_softc *sc) sc->sc_si = softint_establish(SOFTINT_SERIAL, plcomsoft, sc); -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM rnd_attach_source(&sc->rnd_source, sc->sc_dev.dv_xname, RND_TYPE_TTY, 0); #endif @@ -499,7 +499,7 @@ plcom_detach(struct device *self, int flags) /* Unhook the soft interrupt handler. */ softint_disestablish(sc->sc_si); -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM /* Unhook the entropy source. */ rnd_detach_source(&sc->rnd_source); #endif @@ -1935,7 +1935,7 @@ plcomintr(void *arg) /* Wake up the poller. */ softint_schedule(sc->sc_si); -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM rnd_add_uint32(&sc->rnd_source, iir | rsr); #endif diff --git a/sys/arch/evbarm/dev/plcomvar.h b/sys/arch/evbarm/dev/plcomvar.h index 30ca4cd5a16..ed7d44f1604 100644 --- a/sys/arch/evbarm/dev/plcomvar.h +++ b/sys/arch/evbarm/dev/plcomvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: plcomvar.h,v 1.7 2011/11/19 22:51:19 tls Exp $ */ +/* $NetBSD: plcomvar.h,v 1.8 2012/02/02 19:42:59 tls Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -36,7 +36,7 @@ #include "opt_plcom.h" #include "opt_kgdb.h" -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM #include <sys/rnd.h> #endif @@ -133,7 +133,7 @@ struct plcom_softc { pps_info_t ppsinfo; pps_params_t ppsparam; -#if NRND > 0 && defined(RND_COM) +#ifdef RND_COM krndsource_t rnd_source; #endif struct simplelock sc_lock; diff --git a/sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c b/sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c index 1547a5fb013..7b69cbff859 100644 --- a/sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c +++ b/sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_cs_smdk24x0.c,v 1.4 2011/07/01 20:44:21 dyoung Exp $ */ +/* $NetBSD: if_cs_smdk24x0.c,v 1.5 2012/02/02 19:42:59 tls Exp $ */ /* * Copyright (c) 2003 Genetec corporation. All rights reserved. @@ -72,17 +72,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cs_smdk24x0.c,v 1.4 2011/07/01 20:44:21 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cs_smdk24x0.c,v 1.5 2012/02/02 19:42:59 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/socket.h> #include <sys/device.h> -#include "rnd.h" -#if NRND > 0 #include <sys/rnd.h> -#endif #include <net/if.h> #include <net/if_ether.h> diff --git a/sys/arch/evbppc/pmppc/dev/if_cs_mainbus.c b/sys/arch/evbppc/pmppc/dev/if_cs_mainbus.c index 925d1ae4cb9..c31d6302fdc 100644 --- a/sys/arch/evbppc/pmppc/dev/if_cs_mainbus.c +++ b/sys/arch/evbppc/pmppc/dev/if_cs_mainbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_cs_mainbus.c,v 1.6 2011/06/20 05:15:59 matt Exp $ */ +/* $NetBSD: if_cs_mainbus.c,v 1.7 2012/02/02 19:42:59 tls 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.6 2011/06/20 05:15:59 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cs_mainbus.c,v 1.7 2012/02/02 19:42:59 tls Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -38,10 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs_mainbus.c,v 1.6 2011/06/20 05:15:59 matt Exp $ #include <sys/socket.h> #include <sys/bus.h> -#include "rnd.h" -#if NRND > 0 #include <sys/rnd.h> -#endif #include <net/if.h> #include <net/if_ether.h> diff --git a/sys/arch/hp300/dev/rd.c b/sys/arch/hp300/dev/rd.c index 456b7344613..b8891334325 100644 --- a/sys/arch/hp300/dev/rd.c +++ b/sys/arch/hp300/dev/rd.c @@ -1,4 +1,4 @@ -/* $NetBSD: rd.c,v 1.91 2011/07/28 03:42:20 uebayasi Exp $ */ +/* $NetBSD: rd.c,v 1.92 2012/02/02 19:42:59 tls Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -72,10 +72,9 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.91 2011/07/28 03:42:20 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.92 2012/02/02 19:42:59 tls Exp $"); #include "opt_useleds.h" -#include "rnd.h" #include <sys/param.h> #include <sys/systm.h> @@ -90,9 +89,7 @@ __KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.91 2011/07/28 03:42:20 uebayasi Exp $"); #include <sys/proc.h> #include <sys/stat.h> -#if NRND > 0 #include <sys/rnd.h> -#endif #include <hp300/dev/hpibvar.h> @@ -358,13 +355,11 @@ rdattach(device_t parent, device_t self, void *aux) if (rddebug & RDB_ERROR) rderrthresh = 0; #endif -#if NRND > 0 /* * attach the device into the random source list */ rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), RND_TYPE_DISK, 0); -#endif } static int @@ -919,9 +914,7 @@ rdintr(void *arg) } if (rdfinish(sc, bp)) rdustart(sc); -#if NRND > 0 rnd_add_uint32(&sc->rnd_source, bp->b_blkno); -#endif } static int diff --git a/sys/arch/hp300/dev/rdvar.h b/sys/arch/hp300/dev/rdvar.h index 25d5802e824..1dceb7ae5df 100644 --- a/sys/arch/hp300/dev/rdvar.h +++ b/sys/arch/hp300/dev/rdvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: rdvar.h,v 1.21 2011/11/19 22:51:19 tls Exp $ */ +/* $NetBSD: rdvar.h,v 1.22 2012/02/02 19:42:59 tls Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -80,9 +80,7 @@ struct rd_softc { int sc_active; int sc_errcnt; struct rdstats sc_stats; -#if NRND > 0 krndsource_t rnd_source; -#endif }; /* sc_flags values */ diff --git a/sys/arch/hp700/gsc/harmony.c b/sys/arch/hp700/gsc/harmony.c index 01be09b3fd5..7ca26326a3f 100644 --- a/sys/arch/hp700/gsc/harmony.c +++ b/sys/arch/hp700/gsc/harmony.c @@ -1,4 +1,4 @@ -/* $NetBSD: harmony.c,v 1.25 2011/11/24 03:35:56 mrg Exp $ */ +/* $NetBSD: harmony.c,v 1.26 2012/02/02 19:42:59 tls Exp $ */ /* $OpenBSD: harmony.c,v 1.23 2004/02/13 21:28:19 mickey Exp $ */ @@ -61,7 +61,7 @@ * Harmony (CS4215/AD1849 LASI) audio interface. */ -#include "rnd.h" + #include <sys/param.h> #include <sys/kernel.h> @@ -73,9 +73,7 @@ #include <sys/kmem.h> #include <uvm/uvm_extern.h> -#if NRND > 0 #include <sys/rnd.h> -#endif #include <sys/audioio.h> #include <dev/audio_if.h> @@ -171,7 +169,6 @@ void harmony_try_more(struct harmony_softc *, int, int, static void harmony_empty_input(struct harmony_softc *); static void harmony_empty_output(struct harmony_softc *); -#if NRND > 0 void harmony_acc_tmo(void *); #define ADD_CLKALLICA(sc) do { \ (sc)->sc_acc <<= 1; \ @@ -180,7 +177,6 @@ void harmony_acc_tmo(void *); rnd_add_uint32(&(sc)->sc_rnd_source, \ (sc)->sc_acc_num ^= (sc)->sc_acc); \ } while(0) -#endif int harmony_match(device_t parent, struct cfdata *match, void *aux) @@ -323,14 +319,12 @@ harmony_attach(device_t parent, device_t self, void *aux) audio_attach_mi(&harmony_sa_hw_if, sc, sc->sc_dv); -#if NRND > 0 rnd_attach_source(&sc->sc_rnd_source, device_xname(sc->sc_dv), RND_TYPE_UNKNOWN, 0); callout_init(&sc->sc_acc_tmo, 0); callout_setfunc(&sc->sc_acc_tmo, harmony_acc_tmo, sc); sc->sc_acc_num = 0xa5a5a5a5; -#endif } void @@ -350,7 +344,6 @@ harmony_reset_codec(struct harmony_softc *sc) WRITE_REG(sc, HARMONY_RESET, 0); } -#if NRND > 0 void harmony_acc_tmo(void *v) { @@ -360,7 +353,6 @@ harmony_acc_tmo(void *v) ADD_CLKALLICA(sc); callout_schedule(&sc->sc_acc_tmo, 1); } -#endif /* * interrupt handler @@ -374,9 +366,7 @@ harmony_intr(void *vsc) sc = vsc; r = 0; -#if NRND > 0 ADD_CLKALLICA(sc); -#endif mutex_spin_enter(&sc->sc_intr_lock); @@ -1221,9 +1211,7 @@ harmony_start_cp(struct harmony_softc *sc, int start) RCURADD_BUFMASK, &sc->sc_capture); } -#if NRND > 0 callout_schedule(&sc->sc_acc_tmo, 1); -#endif } void diff --git a/sys/arch/hp700/gsc/harmonyvar.h b/sys/arch/hp700/gsc/harmonyvar.h index e1fc3684eff..1d7dd95045b 100644 --- a/sys/arch/hp700/gsc/harmonyvar.h +++ b/sys/arch/hp700/gsc/harmonyvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: harmonyvar.h,v 1.6 2011/11/23 23:07:29 jmcneill Exp $ */ +/* $NetBSD: harmonyvar.h,v 1.7 2012/02/02 19:42:59 tls Exp $ */ /* $OpenBSD: harmonyvar.h,v 1.8 2003/08/15 13:25:53 mickey Exp $ */ @@ -106,11 +106,9 @@ struct harmony_softc { int sc_micpreamp, sc_ov, sc_outputgain; int sc_teleshare; -#if NRND > 0 krndsource_t sc_rnd_source; struct callout sc_acc_tmo; uint32_t sc_acc, sc_acc_num, sc_acc_cnt; -#endif }; #define READ_REG(sc, reg) \ diff --git a/sys/arch/i386/pnpbios/fdc_pnpbios.c b/sys/arch/i386/pnpbios/fdc_pnpbios.c index effad22741e..742ea4f08a1 100644 --- a/sys/arch/i386/pnpbios/fdc_pnpbios.c +++ b/sys/arch/i386/pnpbios/fdc_pnpbios.c @@ -1,4 +1,4 @@ -/* $NetBSD: fdc_pnpbios.c,v 1.16 2011/07/01 18:14:15 dyoung Exp $ */ +/* $NetBSD: fdc_pnpbios.c,v 1.17 2012/02/02 19:42:59 tls Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -34,9 +34,9 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fdc_pnpbios.c,v 1.16 2011/07/01 18:14:15 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fdc_pnpbios.c,v 1.17 2012/02/02 19:42:59 tls Exp $"); + -#include "rnd.h" #include <sys/param.h> #include <sys/systm.h> @@ -44,9 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: fdc_pnpbios.c,v 1.16 2011/07/01 18:14:15 dyoung Exp #include <sys/device.h> #include <sys/buf.h> #include <sys/queue.h> -#if NRND > 0 #include <sys/rnd.h> -#endif #include <sys/bus.h> #include <machine/intr.h> diff --git a/sys/arch/macppc/dev/if_gm.c b/sys/arch/macppc/dev/if_gm.c index a9914ff19ae..cc6e5706e82 100644 --- a/sys/arch/macppc/dev/if_gm.c +++ b/sys/arch/macppc/dev/if_gm.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_gm.c,v 1.40 2011/11/19 22:51:20 tls Exp $ */ +/* $NetBSD: if_gm.c,v 1.41 2012/02/02 19:42:59 tls Exp $ */ /*- * Copyright (c) 2000 Tsubai Masanari. All rights reserved. @@ -27,10 +27,9 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_gm.c,v 1.40 2011/11/19 22:51:20 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_gm.c,v 1.41 2012/02/02 19:42:59 tls Exp $"); #include "opt_inet.h" -#include "rnd.h" #include <sys/param.h> #include <sys/device.h> @@ -41,9 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_gm.c,v 1.40 2011/11/19 22:51:20 tls Exp $"); #include <sys/systm.h> #include <sys/callout.h> -#if NRND > 0 #include <sys/rnd.h> -#endif #include <uvm/uvm_extern.h> @@ -86,9 +83,7 @@ struct gmac_softc { struct callout sc_tick_ch; char sc_laddr[6]; -#if NRND > 0 krndsource_t sc_rnd_source; /* random source */ -#endif }; #define sc_if sc_ethercom.ec_if @@ -252,9 +247,7 @@ gmac_attach(device_t parent, device_t self, void *aux) if_attach(ifp); ether_ifattach(ifp, laddr); -#if NRND > 0 rnd_attach_source(&sc->sc_rnd_source, xname, RND_TYPE_NET, 0); -#endif } u_int @@ -337,9 +330,7 @@ gmac_intr(void *v) if (status & GMAC_INT_TXEMPTY) gmac_tint(sc); -#if NRND > 0 rnd_add_uint32(&sc->sc_rnd_source, status); -#endif return 1; } diff --git a/sys/arch/mips/alchemy/dev/if_aumac.c b/sys/arch/mips/alchemy/dev/if_aumac.c index c2e8f0ed685..091ec76451b 100644 --- a/sys/arch/mips/alchemy/dev/if_aumac.c +++ b/sys/arch/mips/alchemy/dev/if_aumac.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_aumac.c,v 1.33 2012/01/03 07:36:02 kiyohara Exp $ */ +/* $NetBSD: if_aumac.c,v 1.34 2012/02/02 19:42:59 tls Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -46,9 +46,9 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.33 2012/01/03 07:36:02 kiyohara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.34 2012/02/02 19:42:59 tls Exp $"); + -#include "rnd.h" #include <sys/param.h> #include <sys/bus.h> @@ -71,9 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.33 2012/01/03 07:36:02 kiyohara Exp $ #include <net/if_ether.h> #include <net/bpf.h> -#if NRND > 0 #include <sys/rnd.h> -#endif #include <dev/mii/mii.h> #include <dev/mii/miivar.h> @@ -142,9 +140,7 @@ struct aumac_softc { int sc_rxptr; /* next ready Rx descriptor */ -#if NRND > 0 krndsource_t rnd_source; -#endif #ifdef AUMAC_EVENT_COUNTERS struct evcnt sc_ev_txstall; /* Tx stalled */ @@ -341,9 +337,8 @@ aumac_attach(device_t parent, device_t self, void *aux) if_attach(ifp); ether_ifattach(ifp, enaddr); -#if NRND > 0 - rnd_attach_source(&sc->rnd_source, device_xname(self), RND_TYPE_NET, 0); -#endif + rnd_attach_source(&sc->rnd_source, device_xname(self), + RND_TYPE_NET, 0); #ifdef AUMAC_EVENT_COUNTERS evcnt_attach_dynamic(&sc->sc_ev_txstall, EVCNT_TYPE_MISC, @@ -532,10 +527,7 @@ aumac_intr(void *arg) status = aumac_rxintr(sc); status += aumac_txintr(sc); -#if NRND > 0 - if (RND_ENABLED(&sc->rnd_source)) - rnd_add_uint32(&sc->rnd_source, status); -#endif + rnd_add_uint32(&sc->rnd_source, status); return status; } diff --git a/sys/arch/mips/atheros/dev/aevar.h b/sys/arch/mips/atheros/dev/aevar.h index bf2dd3fb584..1f1efb7d412 100644 --- a/sys/arch/mips/atheros/dev/aevar.h +++ b/sys/arch/mips/atheros/dev/aevar.h @@ -1,4 +1,4 @@ -/* $NetBSD: aevar.h,v 1.4 2011/11/19 22:51:20 tls Exp $ */ +/* $NetBSD: aevar.h,v 1.5 2012/02/02 19:43:00 tls Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -33,14 +33,10 @@ #ifndef _MIPS_ATHEROS_DEV_AEVAR_H_ #define _MIPS_ATHEROS_DEV_AEVAR_H_ -#include "rnd.h" - #include <sys/queue.h> #include <sys/callout.h> -#if NRND > 0 #include <sys/rnd.h> -#endif /* * Misc. definitions for the Digital Semiconductor ``Tulip'' (21x4x) @@ -186,9 +182,7 @@ struct ae_softc { int sc_rxptr; /* next ready RX descriptor/descsoft */ -#if NRND > 0 krndsource_t sc_rnd_source; /* random source */ -#endif }; #endif diff --git a/sys/arch/mips/atheros/dev/if_ae.c b/sys/arch/mips/atheros/dev/if_ae.c index b44f666a441..c51a1083b16 100644 --- a/sys/arch/mips/atheros/dev/if_ae.c +++ b/sys/arch/mips/atheros/dev/if_ae.c @@ -1,4 +1,4 @@ -/* $Id: if_ae.c,v 1.21 2011/07/10 06:24:19 matt Exp $ */ +/* $Id: if_ae.c,v 1.22 2012/02/02 19:43:00 tls Exp $ */ /*- * Copyright (c) 2006 Urbana-Champaign Independent Media Center. * Copyright (c) 2006 Garrett D'Amore. @@ -98,7 +98,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.21 2011/07/10 06:24:19 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.22 2012/02/02 19:43:00 tls Exp $"); #include <sys/param.h> @@ -384,10 +384,8 @@ ae_attach(device_t parent, device_t self, void *aux) ether_ifattach(ifp, enaddr); ether_set_ifflags_cb(&sc->sc_ethercom, ae_ifflags_cb); -#if NRND > 0 rnd_attach_source(&sc->sc_rnd_source, sc->sc_dev.dv_xname, RND_TYPE_NET, 0); -#endif /* * Make sure the interface is shutdown during reboot. @@ -487,9 +485,7 @@ ae_detach(device_t self, int flags) /* Delete all remaining media. */ ifmedia_delete_instance(&sc->sc_mii.mii_media, IFM_INST_ANY); -#if NRND > 0 rnd_detach_source(&sc->sc_rnd_source); -#endif ether_ifdetach(ifp); if_detach(ifp); @@ -999,10 +995,8 @@ ae_intr(void *arg) /* Try to get more packets going. */ ae_start(ifp); -#if NRND > 0 if (handled) rnd_add_uint32(&sc->sc_rnd_source, status); -#endif return (handled); } diff --git a/sys/arch/mips/sibyte/dev/sbjcnvar.h b/sys/arch/mips/sibyte/dev/sbjcnvar.h index 5be981b6e2e..b09077e21ea 100644 --- a/sys/arch/mips/sibyte/dev/sbjcnvar.h +++ b/sys/arch/mips/sibyte/dev/sbjcnvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: sbjcnvar.h,v 1.3 2011/02/01 03:16:54 matt Exp $ */ +/* $NetBSD: sbjcnvar.h,v 1.4 2012/02/02 19:43:00 tls Exp $ */ /* * Copyright 2000, 2001 @@ -65,7 +65,7 @@ */ #include "rnd.h" -#if NRND > 0 && defined(RND_SBJCN) +#ifdef RND_SBJCN #include <sys/rnd.h> #endif diff --git a/sys/arch/mips/sibyte/dev/sbscn.c b/sys/arch/mips/sibyte/dev/sbscn.c index 8191b7bfed6..d8d9bec6320 100644 --- a/sys/arch/mips/sibyte/dev/sbscn.c +++ b/sys/arch/mips/sibyte/dev/sbscn.c @@ -1,4 +1,4 @@ -/* $NetBSD: sbscn.c,v 1.36 2011/07/10 23:32:03 matt Exp $ */ +/* $NetBSD: sbscn.c,v 1.37 2012/02/02 19:43:00 tls Exp $ */ /* * Copyright 2000, 2001 @@ -109,7 +109,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sbscn.c,v 1.36 2011/07/10 23:32:03 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sbscn.c,v 1.37 2012/02/02 19:43:00 tls Exp $"); #define SBSCN_DEBUG @@ -117,7 +117,7 @@ __KERNEL_RCSID(0, "$NetBSD: sbscn.c,v 1.36 2011/07/10 23:32:03 matt Exp $"); #include "ioconf.h" #include "rnd.h" -#if NRND > 0 && defined(RND_SBSCN) +#ifdef RND_SBSCN #include <sys/rnd.h> #endif @@ -382,7 +382,7 @@ sbscn_attach_channel(struct sbscn_softc *sc, int chan, int intr) ch->ch_si = softint_establish(SOFTINT_SERIAL, sbscn_soft, ch); -#if NRND > 0 && defined(RND_SBSCN) +#ifdef RND_SBSCN rnd_attach_source(&ch->ch_rnd_source, device_xname(sc->sc_dev), RND_TYPE_TTY, 0); #endif @@ -1661,7 +1661,7 @@ XXX /* Wake up the poller. */ softint_schedule(ch->ch_si); -#if NRND > 0 && defined(RND_SBSCN) +#ifdef RND_SBSCN rnd_add_uint32(&ch->ch_rnd_source, isr | sr); #endif } diff --git a/sys/arch/mips/sibyte/dev/sbscnvar.h b/sys/arch/mips/sibyte/dev/sbscnvar.h index 7d50bb35314..860be00cd45 100644 --- a/sys/arch/mips/sibyte/dev/sbscnvar.h +++ b/sys/arch/mips/sibyte/dev/sbscnvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: sbscnvar.h,v 1.5 2011/11/19 22:51:20 tls Exp $ */ +/* $NetBSD: sbscnvar.h,v 1.6 2012/02/02 19:43:00 tls Exp $ */ /* * Copyright 2000, 2001 @@ -65,7 +65,7 @@ */ #include "rnd.h" -#if NRND > 0 && defined(RND_SBSCN) +#ifdef RND_SBSCN #include <sys/rnd.h> #endif @@ -156,7 +156,7 @@ struct sbscn_channel { u_char ch_i_dcd_pin, ch_i_cts_pin, ch_i_dsr_pin, ch_i_ri_pin; u_char ch_o_dtr_pin, ch_o_rts_pin; -#if NRND > 0 && defined(RND_SBSCN) +#ifdef RND_SBSCN krndsource_t ch_rnd_source; #endif }; diff --git a/sys/arch/next68k/dev/mb8795.c b/sys/arch/next68k/dev/mb8795.c index 4b04ad179d9..0f4eaaa66e9 100644 --- a/sys/arch/next68k/dev/mb8795.c +++ b/sys/arch/next68k/dev/mb8795.c @@ -1,4 +1,4 @@ -/* $NetBSD: mb8795.c,v 1.49 2010/04/24 19:58:13 dbj Exp $ */ +/* $NetBSD: mb8795.c,v 1.50 2012/02/02 19:43:00 tls Exp $ */ /* * Copyright (c) 1998 Darrin B. Jewell * All rights reserved. @@ -25,10 +25,9 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.49 2010/04/24 19:58:13 dbj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.50 2012/02/02 19:43:00 tls Exp $"); #include "opt_inet.h" -#include "rnd.h" #include <sys/param.h> #include <sys/systm.h> @@ -39,9 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.49 2010/04/24 19:58:13 dbj Exp $"); #include <sys/malloc.h> #include <sys/ioctl.h> #include <sys/errno.h> -#if NRND > 0 #include <sys/rnd.h> -#endif #include <net/if.h> #include <net/if_dl.h> @@ -140,10 +137,8 @@ mb8795_config(struct mb8795_softc *sc, int *media, int nmedia, int defmedia) if (sc->sc_sh == NULL) panic("mb8795_config: can't establish shutdownhook"); -#if NRND > 0 rnd_attach_source(&sc->rnd_source, sc->sc_dev.dv_xname, RND_TYPE_NET, 0); -#endif DPRINTF(("%s: leaving mb8795_config()\n",sc->sc_dev.dv_xname)); } diff --git a/sys/arch/next68k/dev/mb8795var.h b/sys/arch/next68k/dev/mb8795var.h index c53f79b4fb8..1379d5067c9 100644 --- a/sys/arch/next68k/dev/mb8795var.h +++ b/sys/arch/next68k/dev/mb8795var.h @@ -1,4 +1,4 @@ -/* $NetBSD: mb8795var.h,v 1.12 2011/11/19 22:51:20 tls Exp $ */ +/* $NetBSD: mb8795var.h,v 1.13 2012/02/02 19:43:00 tls Exp $ */ /* * Copyright (c) 1998 Darrin B. Jewell * All rights reserved. @@ -24,10 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "rnd.h" /* is random device-driver configured? */ -#if NRND > 0 #include <sys/rnd.h> -#endif /* NRND */ #define MB8795_NRXBUFS (32) @@ -71,9 +68,7 @@ struct mb8795_softc { struct ifmedia sc_media; -#if NRND > 0 krndsource_t rnd_source; -#endif /* NRND */ }; diff --git a/sys/arch/prep/pnpbus/fdc_pnpbus.c b/sys/arch/prep/pnpbus/fdc_pnpbus.c index 0a418b751ee..a62c3d691e4 100644 --- a/sys/arch/prep/pnpbus/fdc_pnpbus.c +++ b/sys/arch/prep/pnpbus/fdc_pnpbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: fdc_pnpbus.c,v 1.3 2011/07/01 16:55:42 dyoung Exp $ */ +/* $NetBSD: fdc_pnpbus.c,v 1.4 2012/02/02 19:43:00 tls Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -34,9 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fdc_pnpbus.c,v 1.3 2011/07/01 16:55:42 dyoung Exp $"); - -#include "rnd.h" +__KERNEL_RCSID(0, "$NetBSD: fdc_pnpbus.c,v 1.4 2012/02/02 19:43:00 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -44,9 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: fdc_pnpbus.c,v 1.3 2011/07/01 16:55:42 dyoung Exp $" #include <sys/device.h> #include <sys/buf.h> #include <sys/queue.h> -#if NRND > 0 #include <sys/rnd.h> -#endif #include <sys/bus.h> #include <machine/intr.h> diff --git a/sys/arch/sgimips/hpc/if_sq.c b/sys/arch/sgimips/hpc/if_sq.c index 9aea1e5845a..f0c22b951a5 100644 --- a/sys/arch/sgimips/hpc/if_sq.c +++ b/sys/arch/sgimips/hpc/if_sq.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_sq.c,v 1.42 2011/07/01 18:53:47 dyoung Exp $ */ +/* $NetBSD: if_sq.c,v 1.43 2012/02/02 19:43:00 tls Exp $ */ /* * Copyright (c) 2001 Rafal K. Boni @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_sq.c,v 1.42 2011/07/01 18:53:47 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sq.c,v 1.43 2012/02/02 19:43:00 tls Exp $"); #include <sys/param.h> @@ -927,10 +927,8 @@ sq_intr(void *arg) handled++; } -#if NRND > 0 if (handled) rnd_add_uint32(&sc->rnd_source, stat); -#endif return handled; } diff --git a/sys/arch/sgimips/hpc/sqvar.h b/sys/arch/sgimips/hpc/sqvar.h index cef219c5d86..b5945a5ab70 100644 --- a/sys/arch/sgimips/hpc/sqvar.h +++ b/sys/arch/sgimips/hpc/sqvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: sqvar.h,v 1.13 2011/11/19 22:51:20 tls Exp $ */ +/* $NetBSD: sqvar.h,v 1.14 2012/02/02 19:43:00 tls Exp $ */ /* * Copyright (c) 2001 Rafal K. Boni @@ -30,14 +30,10 @@ #ifndef _ARCH_SGIMIPS_HPC_SQVAR_H_ #define _ARCH_SGIMIPS_HPC_SQVAR_H_ -#include "rnd.h" - #include <sys/queue.h> #include <sys/callout.h> -#if NRND > 0 #include <sys/rnd.h> -#endif #include <sgimips/hpc/hpcvar.h> #include <sgimips/hpc/hpcreg.h> @@ -156,9 +152,7 @@ struct sq_softc { struct evcnt sq_intrcnt; /* count interrupts */ -#if NRND > 0 krndsource_t rnd_source; /* random source */ -#endif struct hpc_values *hpc_regs; /* HPC register definitions */ int sq_trace_idx; diff --git a/sys/arch/sgimips/mace/if_mec.c b/sys/arch/sgimips/mace/if_mec.c index 8775365559a..3e5da39588f 100644 --- a/sys/arch/sgimips/mace/if_mec.c +++ b/sys/arch/sgimips/mace/if_mec.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_mec.c,v 1.47 2011/11/19 22:51:20 tls Exp $ */ +/* $NetBSD: if_mec.c,v 1.48 2012/02/02 19:43:00 tls Exp $ */ /*- * Copyright (c) 2004, 2008 Izumi Tsutsui. All rights reserved. @@ -61,10 +61,9 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_mec.c,v 1.47 2011/11/19 22:51:20 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_mec.c,v 1.48 2012/02/02 19:43:00 tls Exp $"); #include "opt_ddb.h" -#include "rnd.h" #include <sys/param.h> #include <sys/systm.h> @@ -77,9 +76,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_mec.c,v 1.47 2011/11/19 22:51:20 tls Exp $"); #include <sys/ioctl.h> #include <sys/errno.h> -#if NRND > 0 #include <sys/rnd.h> -#endif #include <net/if.h> #include <net/if_dl.h> @@ -316,9 +313,7 @@ struct mec_softc { int sc_rxptr; /* next ready RX buffer */ -#if NRND > 0 krndsource_t sc_rnd_source; /* random source */ -#endif #ifdef MEC_EVENT_COUNTERS struct evcnt sc_ev_txpkts; /* TX packets queued total */ struct evcnt sc_ev_txdpad; /* TX packets padded in txdesc buf */ @@ -624,10 +619,8 @@ mec_attach(device_t parent, device_t self, void *aux) /* establish interrupt */ cpu_intr_establish(maa->maa_intr, maa->maa_intrmask, mec_intr, sc); -#if NRND > 0 rnd_attach_source(&sc->sc_rnd_source, device_xname(self), RND_TYPE_NET, 0); -#endif #ifdef MEC_EVENT_COUNTERS evcnt_attach_dynamic(&sc->sc_ev_txpkts , EVCNT_TYPE_MISC, @@ -1619,10 +1612,8 @@ mec_intr(void *arg) mec_start(ifp); } -#if NRND > 0 if (handled) rnd_add_uint32(&sc->sc_rnd_source, statreg); -#endif return handled; } diff --git a/sys/arch/sh3/dev/sci.c b/sys/arch/sh3/dev/sci.c index ab142568bd5..0538f52df47 100644 --- a/sys/arch/sh3/dev/sci.c +++ b/sys/arch/sh3/dev/sci.c @@ -1,4 +1,4 @@ -/* $NetBSD: sci.c,v 1.53 2011/04/24 16:26:57 rmind Exp $ */ +/* $NetBSD: sci.c,v 1.54 2012/02/02 19:43:00 tls Exp $ */ /*- * Copyright (C) 1999 T.Horiuchi and SAITOH Masanobu. All rights reserved. @@ -93,7 +93,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sci.c,v 1.53 2011/04/24 16:26:57 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sci.c,v 1.54 2012/02/02 19:43:00 tls Exp $"); #include "opt_kgdb.h" #include "opt_sci.h" @@ -1263,7 +1263,7 @@ sciintr(void *arg) /* Wake up the poller. */ softint_schedule(sc->sc_si); -#if NRND > 0 && defined(RND_SCI) +#ifdef RND_SCI rnd_add_uint32(&sc->rnd_source, iir | lsr); #endif diff --git a/sys/arch/sh3/dev/scif.c b/sys/arch/sh3/dev/scif.c index 6c32dfb1866..92e2b7a24b2 100644 --- a/sys/arch/sh3/dev/scif.c +++ b/sys/arch/sh3/dev/scif.c @@ -1,4 +1,4 @@ -/* $NetBSD: scif.c,v 1.60 2011/04/24 16:26:57 rmind Exp $ */ +/* $NetBSD: scif.c,v 1.61 2012/02/02 19:43:00 tls Exp $ */ /*- * Copyright (C) 1999 T.Horiuchi and SAITOH Masanobu. All rights reserved. @@ -93,7 +93,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: scif.c,v 1.60 2011/04/24 16:26:57 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: scif.c,v 1.61 2012/02/02 19:43:00 tls Exp $"); #include "opt_kgdb.h" #include "opt_scif.h" @@ -1401,7 +1401,7 @@ scifintr(void *arg) /* Wake up the poller. */ softint_schedule(sc->sc_si); -#if NRND > 0 && defined(RND_SCIF) +#ifdef RND_SCIF rnd_add_uint32(&sc->rnd_source, iir | lsr); #endif diff --git a/sys/arch/sun2/dev/if_ec.c b/sys/arch/sun2/dev/if_ec.c index 0237ba2e716..b6aae6dedd9 100644 --- a/sys/arch/sun2/dev/if_ec.c +++ b/sys/arch/sun2/dev/if_ec.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ec.c,v 1.19 2011/11/19 22:51:21 tls Exp $ */ +/* $NetBSD: if_ec.c,v 1.20 2012/02/02 19:43:00 tls Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -34,11 +34,10 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.19 2011/11/19 22:51:21 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.20 2012/02/02 19:43:00 tls Exp $"); #include "opt_inet.h" #include "opt_ns.h" -#include "rnd.h" #include <sys/param.h> #include <sys/systm.h> @@ -49,9 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.19 2011/11/19 22:51:21 tls Exp $"); #include <sys/syslog.h> #include <sys/device.h> #include <sys/endian.h> -#if NRND > 0 #include <sys/rnd.h> -#endif #include <net/if.h> #include <net/if_dl.h> @@ -101,9 +98,7 @@ struct ec_softc { u_char sc_colliding; /* nonzero if the net is colliding */ uint32_t sc_backoff_seed; /* seed for the backoff PRNG */ -#if NRND > 0 krndsource_t rnd_source; -#endif }; /* Macros to read and write the CSR. */ @@ -249,10 +244,8 @@ ec_attach(device_t parent, device_t self, void *aux) bus_intr_establish(mbma->mbma_bustag, mbma->mbma_pri, IPL_NET, 0, ec_intr, sc); -#if NRND > 0 rnd_attach_source(&sc->rnd_source, device_xname(self), RND_TYPE_NET, 0); -#endif } /* diff --git a/sys/arch/x68k/dev/fd.c b/sys/arch/x68k/dev/fd.c index 5d41b3141e9..94258e25c9a 100644 --- a/sys/arch/x68k/dev/fd.c +++ b/sys/arch/x68k/dev/fd.c @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.95 2011/11/19 22:51:21 tls Exp $ */ +/* $NetBSD: fd.c,v 1.96 2012/02/02 19:43:01 tls Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -64,9 +64,8 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.95 2011/11/19 22:51:21 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.96 2012/02/02 19:43:01 tls Exp $"); -#include "rnd.h" #include "opt_ddb.h" #include "opt_m68k_arch.h" @@ -88,9 +87,7 @@ __KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.95 2011/11/19 22:51:21 tls Exp $"); #include <sys/syslog.h> #include <sys/queue.h> #include <sys/fdio.h> -#if NRND > 0 #include <sys/rnd.h> -#endif #include <uvm/uvm_extern.h> @@ -244,9 +241,7 @@ struct fd_softc { #define SEC_P01 0x01 /* second part */ #define SEC_P11 0x03 /* both part */ -#if NRND > 0 krndsource_t rnd_source; -#endif }; /* floppy driver configuration */ @@ -605,10 +600,8 @@ fdattach(device_t parent, device_t self, void *aux) */ mountroothook_establish(fd_mountroot_hook, fd->sc_dev); -#if NRND > 0 rnd_attach_source(&fd->rnd_source, device_xname(fd->sc_dev), RND_TYPE_DISK, 0); -#endif } inline struct fd_type * @@ -737,9 +730,7 @@ fdfinish(struct fd_softc *fd, struct buf *bp) bp->b_resid = fd->sc_bcount; fd->sc_skip = 0; -#if NRND > 0 rnd_add_uint32(&fd->rnd_source, bp->b_blkno); -#endif biodone(bp); /* turn off motor 5s from now */ diff --git a/sys/arch/x86/pci/fwhrng.c b/sys/arch/x86/pci/fwhrng.c index 58169039052..0f646e3fa20 100644 --- a/sys/arch/x86/pci/fwhrng.c +++ b/sys/arch/x86/pci/fwhrng.c @@ -1,4 +1,4 @@ -/* $NetBSD: fwhrng.c,v 1.4 2011/11/19 22:51:21 tls Exp $ */ +/* $NetBSD: fwhrng.c,v 1.5 2012/02/02 19:43:01 tls Exp $ */ /* * Copyright (c) 2000 Michael Shalayeff @@ -29,13 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fwhrng.c,v 1.4 2011/11/19 22:51:21 tls Exp $"); - -#include "rnd.h" - -#if NRND == 0 -#error fwhrng requires rnd pseudo-device -#endif +__KERNEL_RCSID(0, "$NetBSD: fwhrng.c,v 1.5 2012/02/02 19:43:01 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/arch/x86/x86/ipmi.c b/sys/arch/x86/x86/ipmi.c index 8ec1073475d..6be5ab0de42 100644 --- a/sys/arch/x86/x86/ipmi.c +++ b/sys/arch/x86/x86/ipmi.c @@ -1,4 +1,4 @@ -/* $NetBSD: ipmi.c,v 1.51 2012/01/10 15:23:11 njoly Exp $ */ +/* $NetBSD: ipmi.c,v 1.52 2012/02/02 19:43:01 tls Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.51 2012/01/10 15:23:11 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.52 2012/02/02 19:43:01 tls Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -66,6 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.51 2012/01/10 15:23:11 njoly Exp $"); #include <sys/kthread.h> #include <sys/bus.h> #include <sys/intr.h> +#include <sys/rnd.h> #include <x86/smbiosvar.h> @@ -87,13 +88,15 @@ struct ipmi_sensor { sysmon_envsys_lim_t i_limits, i_deflims; uint32_t i_props, i_defprops; SLIST_ENTRY(ipmi_sensor) i_list; + int32_t i_prevval; /* feed rnd source on change */ + krndsource_t i_rnd; }; int ipmi_nintr; int ipmi_dbg = 0; int ipmi_enabled = 0; -#define SENSOR_REFRESH_RATE (5 * hz) +#define SENSOR_REFRESH_RATE (hz / 2) #define SMBIOS_TYPE_IPMI 0x26 @@ -1499,6 +1502,10 @@ ipmi_convert_sensor(uint8_t *reading, struct ipmi_sensor *psensor) val = 0; break; } + if (val != psensor->i_prevval) { + rnd_add_uint32(&psensor->i_rnd, val); + psensor->i_prevval = val; + } return val; } @@ -1852,6 +1859,22 @@ add_child_sensors(struct ipmi_softc *sc, uint8_t *psdr, int count, ipmi_is_dupname(psensor->i_envdesc)); } + /* + * Add entropy source. + */ + switch (psensor->i_envtype) { + case ENVSYS_STEMP: + case ENVSYS_SFANRPM: + rnd_attach_source(&psensor->i_rnd, + psensor->i_envdesc, + RND_TYPE_ENV, 0); + break; + default: /* XXX intrusion sensors? */ + rnd_attach_source(&psensor->i_rnd, + psensor->i_envdesc, + RND_TYPE_POWER, 0); + } + dbg_printf(5, "add sensor:%.4x %.2x:%d ent:%.2x:%.2x %s\n", s1->sdrhdr.record_id, s1->sensor_type, typ, s1->entity_id, s1->entity_instance, diff --git a/sys/arch/x86/x86/via_padlock.c b/sys/arch/x86/x86/via_padlock.c index 0340c1818f0..aa0d7b96a50 100644 --- a/sys/arch/x86/x86/via_padlock.c +++ b/sys/arch/x86/x86/via_padlock.c @@ -1,5 +1,5 @@ /* $OpenBSD: via.c,v 1.8 2006/11/17 07:47:56 tom Exp $ */ -/* $NetBSD: via_padlock.c,v 1.20 2012/01/17 03:39:33 jakllsch Exp $ */ +/* $NetBSD: via_padlock.c,v 1.21 2012/02/02 19:43:01 tls Exp $ */ /*- * Copyright (c) 2003 Jason Wright @@ -20,14 +20,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: via_padlock.c,v 1.20 2012/01/17 03:39:33 jakllsch Exp $"); - -#ifdef _KERNEL_OPT -# include "rnd.h" -# if NRND == 0 -# error padlock requires rnd pseudo-devices -# endif -#endif +__KERNEL_RCSID(0, "$NetBSD: via_padlock.c,v 1.21 2012/02/02 19:43:01 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/arch/xen/include/xbdvar.h b/sys/arch/xen/include/xbdvar.h index 28fe36e418c..101aff9fc54 100644 --- a/sys/arch/xen/include/xbdvar.h +++ b/sys/arch/xen/include/xbdvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: xbdvar.h,v 1.13 2011/11/19 22:51:21 tls Exp $ */ +/* $NetBSD: xbdvar.h,v 1.14 2012/02/02 19:43:01 tls Exp $ */ /* * @@ -39,9 +39,7 @@ struct xbd_softc { struct dk_intf *sc_di; /* pseudo-disk interface */ struct simplelock sc_slock; /* our lock */ int sc_shutdown; /* about to be removed */ -#if NRND > 0 krndsource_t sc_rnd_source; -#endif }; struct xbd_attach_args { diff --git a/sys/arch/xen/xen/if_xennet_xenbus.c b/sys/arch/xen/xen/if_xennet_xenbus.c index 4ab6bd1bdc7..2de6bfaa976 100644 --- a/sys/arch/xen/xen/if_xennet_xenbus.c +++ b/sys/arch/xen/xen/if_xennet_xenbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_xennet_xenbus.c,v 1.57 2012/01/04 10:48:24 cherry Exp $ */ +/* $NetBSD: if_xennet_xenbus.c,v 1.58 2012/02/02 19:43:01 tls Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -85,11 +85,10 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.57 2012/01/04 10:48:24 cherry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.58 2012/02/02 19:43:01 tls Exp $"); #include "opt_xen.h" #include "opt_nfs_boot.h" -#include "rnd.h" #include <sys/param.h> #include <sys/device.h> @@ -98,9 +97,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.57 2012/01/04 10:48:24 cherry #include <sys/proc.h> #include <sys/systm.h> #include <sys/intr.h> -#if NRND > 0 #include <sys/rnd.h> -#endif #include <net/if.h> #include <net/if_dl.h> @@ -204,9 +201,7 @@ struct xennet_xenbus_softc { unsigned long sc_rx_feature; #define FEATURE_RX_FLIP 0 #define FEATURE_RX_COPY 1 -#if NRND > 0 krndsource_t sc_rnd_source; -#endif }; #define SC_NLIVEREQ(sc) ((sc)->sc_rx_ring.req_prod_pvt - \ (sc)->sc_rx_ring.sring->rsp_prod) @@ -397,10 +392,8 @@ xennet_xenbus_attach(device_t parent, device_t self, void *aux) return; } -#if NRND > 0 rnd_attach_source(&sc->sc_rnd_source, device_xname(sc->sc_dev), RND_TYPE_NET, 0); -#endif if (!pmf_device_register(self, xennet_xenbus_suspend, xennet_xenbus_resume)) @@ -439,10 +432,8 @@ xennet_xenbus_detach(device_t self, int flags) ether_ifdetach(ifp); if_detach(ifp); -#if NRND > 0 /* Unhook the entropy source. */ rnd_detach_source(&sc->sc_rnd_source); -#endif while (xengnt_status(sc->sc_tx_ring_gntref)) { tsleep(xennet_xenbus_detach, PRIBIO, "xnet_txref", hz/2); @@ -991,9 +982,7 @@ xennet_handler(void *arg) xennet_tx_complete(sc); -#if NRND > 0 rnd_add_uint32(&sc->sc_rnd_source, sc->sc_tx_ring.req_prod_pvt); -#endif again: DPRINTFN(XEDB_EVENT, ("xennet_handler prod %d cons %d\n", @@ -1166,9 +1155,7 @@ xennet_start(struct ifnet *ifp) DPRINTFN(XEDB_FOLLOW, ("%s: xennet_start()\n", device_xname(sc->sc_dev))); -#if NRND > 0 rnd_add_uint32(&sc->sc_rnd_source, sc->sc_tx_ring.req_prod_pvt); -#endif xennet_tx_complete(sc); diff --git a/sys/arch/xen/xen/pciback.c b/sys/arch/xen/xen/pciback.c index 2894c721a85..3ec6bf61a33 100644 --- a/sys/arch/xen/xen/pciback.c +++ b/sys/arch/xen/xen/pciback.c @@ -1,4 +1,4 @@ -/* $NetBSD: pciback.c,v 1.6 2011/12/07 15:47:43 cegger Exp $ */ +/* $NetBSD: pciback.c,v 1.7 2012/02/02 19:43:01 tls Exp $ */ /* * Copyright (c) 2009 Manuel Bouyer. @@ -26,10 +26,10 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pciback.c,v 1.6 2011/12/07 15:47:43 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pciback.c,v 1.7 2012/02/02 19:43:01 tls Exp $"); #include "opt_xen.h" -#include "rnd.h" + #include <sys/types.h> #include <sys/param.h> diff --git a/sys/arch/xen/xen/xbd_xenbus.c b/sys/arch/xen/xen/xbd_xenbus.c index fa8640927de..e48a1bbd625 100644 --- a/sys/arch/xen/xen/xbd_xenbus.c +++ b/sys/arch/xen/xen/xbd_xenbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: xbd_xenbus.c,v 1.51 2012/01/27 19:48:39 para Exp $ */ +/* $NetBSD: xbd_xenbus.c,v 1.52 2012/02/02 19:43:01 tls Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -50,10 +50,10 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.51 2012/01/27 19:48:39 para Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.52 2012/02/02 19:43:01 tls Exp $"); #include "opt_xen.h" -#include "rnd.h" + #include <sys/param.h> #include <sys/buf.h> @@ -73,9 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.51 2012/01/27 19:48:39 para Exp $") #include <uvm/uvm.h> -#if NRND > 0 #include <sys/rnd.h> -#endif #include <xen/hypervisor.h> #include <xen/evtchn.h> @@ -154,9 +152,7 @@ struct xbd_xenbus_softc { u_long sc_info; /* VDISK_* */ u_long sc_handle; /* from backend */ int sc_cache_flush; /* backend supports BLKIF_OP_FLUSH_DISKCACHE */ -#if NRND > 0 krndsource_t sc_rnd_source; -#endif }; #if 0 @@ -305,10 +301,8 @@ xbd_xenbus_attach(device_t parent, device_t self, void *aux) return; } -#if NRND > 0 rnd_attach_source(&sc->sc_rnd_source, device_xname(self), RND_TYPE_DISK, RND_FLAG_NO_COLLECT | RND_FLAG_NO_ESTIMATE); -#endif if (!pmf_device_register(self, xbd_xenbus_suspend, xbd_xenbus_resume)) aprint_error_dev(self, "couldn't establish power handler\n"); @@ -370,10 +364,8 @@ xbd_xenbus_detach(device_t dev, int flags) /* detach disk */ disk_detach(&sc->sc_dksc.sc_dkdev); disk_destroy(&sc->sc_dksc.sc_dkdev); -#if NRND > 0 /* Unhook the entropy source. */ rnd_detach_source(&sc->sc_rnd_source); -#endif } hypervisor_mask_event(sc->sc_evtchn); @@ -720,10 +712,8 @@ next: disk_unbusy(&sc->sc_dksc.sc_dkdev, (bp->b_bcount - bp->b_resid), (bp->b_flags & B_READ)); -#if NRND > 0 rnd_add_uint32(&sc->sc_rnd_source, bp->b_blkno); -#endif biodone(bp); SLIST_INSERT_HEAD(&sc->sc_xbdreq_head, xbdreq, req_next); } diff --git a/sys/arch/xen/xen/xpci_xenbus.c b/sys/arch/xen/xen/xpci_xenbus.c index b2647a06377..1ad1ac98bea 100644 --- a/sys/arch/xen/xen/xpci_xenbus.c +++ b/sys/arch/xen/xen/xpci_xenbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: xpci_xenbus.c,v 1.9 2011/12/07 15:47:43 cegger Exp $ */ +/* $NetBSD: xpci_xenbus.c,v 1.10 2012/02/02 19:43:01 tls Exp $ */ /* * Copyright (c) 2009 Manuel Bouyer. @@ -26,10 +26,10 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xpci_xenbus.c,v 1.9 2011/12/07 15:47:43 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xpci_xenbus.c,v 1.10 2012/02/02 19:43:01 tls Exp $"); #include "opt_xen.h" -#include "rnd.h" + #include <sys/types.h> #include <sys/param.h> |
