Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Entropy-pool implementation move and cleanup.
details: https://anonhg.NetBSD.org/src/rev/81f6d7a32a7e
branches: trunk
changeset: 773462:81f6d7a32a7e
user: tls <tls%NetBSD.org@localhost>
date: Thu Feb 02 19:42:57 2012 +0000
description:
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:
sbin/rndctl/rndctl.c | 8 +-
sys/arch/acorn26/ioc/arckbd.c | 18 +-
sys/arch/acorn32/eb7500atx/if_cs.c | 8 +-
sys/arch/alpha/sableio/fdc_sableio.c | 6 +-
sys/arch/arm/at91/at91dbgu.c | 12 +-
sys/arch/arm/at91/at91dbguvar.h | 4 +-
sys/arch/arm/at91/at91usart.c | 10 +-
sys/arch/arm/at91/at91usartvar.h | 4 +-
sys/arch/arm/ep93xx/epcom.c | 10 +-
sys/arch/arm/ep93xx/epcomvar.h | 4 +-
sys/arch/arm/imx/imxuart.c | 12 +-
sys/arch/arm/ixp12x0/ixp12x0_com.c | 10 +-
sys/arch/arm/s3c2xx0/sscom.c | 14 +-
sys/arch/arm/s3c2xx0/sscom_var.h | 4 +-
sys/arch/arm/sa11x0/sa1111_kbc.c | 12 +-
sys/arch/arm/sa11x0/sa11x0_com.c | 12 +-
sys/arch/arm/xscale/ixp425_if_npe.c | 22 +-
sys/arch/emips/ebus/ace_ebus.c | 18 +-
sys/arch/emips/ebus/flash_ebus.c | 16 +-
sys/arch/emips/ebus/if_le_ebus.c | 14 +-
sys/arch/evbarm/dev/plcom.c | 12 +-
sys/arch/evbarm/dev/plcomvar.h | 6 +-
sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c | 7 +-
sys/arch/evbppc/pmppc/dev/if_cs_mainbus.c | 7 +-
sys/arch/hp300/dev/rd.c | 11 +-
sys/arch/hp300/dev/rdvar.h | 4 +-
sys/arch/hp700/gsc/harmony.c | 16 +-
sys/arch/hp700/gsc/harmonyvar.h | 4 +-
sys/arch/i386/pnpbios/fdc_pnpbios.c | 8 +-
sys/arch/macppc/dev/if_gm.c | 13 +-
sys/arch/mips/alchemy/dev/if_aumac.c | 20 +-
sys/arch/mips/atheros/dev/aevar.h | 8 +-
sys/arch/mips/atheros/dev/if_ae.c | 10 +-
sys/arch/mips/sibyte/dev/sbjcnvar.h | 4 +-
sys/arch/mips/sibyte/dev/sbscn.c | 10 +-
sys/arch/mips/sibyte/dev/sbscnvar.h | 6 +-
sys/arch/next68k/dev/mb8795.c | 9 +-
sys/arch/next68k/dev/mb8795var.h | 7 +-
sys/arch/prep/pnpbus/fdc_pnpbus.c | 8 +-
sys/arch/sgimips/hpc/if_sq.c | 6 +-
sys/arch/sgimips/hpc/sqvar.h | 8 +-
sys/arch/sgimips/mace/if_mec.c | 13 +-
sys/arch/sh3/dev/sci.c | 6 +-
sys/arch/sh3/dev/scif.c | 6 +-
sys/arch/sun2/dev/if_ec.c | 11 +-
sys/arch/x68k/dev/fd.c | 13 +-
sys/arch/x86/pci/fwhrng.c | 10 +-
sys/arch/x86/x86/ipmi.c | 29 +-
sys/arch/x86/x86/via_padlock.c | 11 +-
sys/arch/xen/include/xbdvar.h | 4 +-
sys/arch/xen/xen/if_xennet_xenbus.c | 17 +-
sys/arch/xen/xen/pciback.c | 6 +-
sys/arch/xen/xen/xbd_xenbus.c | 16 +-
sys/arch/xen/xen/xpci_xenbus.c | 6 +-
sys/conf/files | 6 +-
sys/dev/acpi/acpi_tz.c | 42 +-
sys/dev/acpi/fdc_acpi.c | 6 +-
sys/dev/ata/ld_ataraid.c | 8 +-
sys/dev/ata/wd.c | 14 +-
sys/dev/ata/wdvar.h | 6 +-
sys/dev/cardbus/if_fxp_cardbus.c | 7 +-
sys/dev/cardbus/if_rtk_cardbus.c | 7 +-
sys/dev/cardbus/rbus_ppb.c | 6 +-
sys/dev/gpib/rd.c | 14 +-
sys/dev/i2o/ld_iop.c | 8 +-
sys/dev/ic/am7990.c | 10 +-
sys/dev/ic/am79900.c | 10 +-
sys/dev/ic/com.c | 12 +-
sys/dev/ic/comvar.h | 6 +-
sys/dev/ic/cs89x0.c | 17 +-
sys/dev/ic/cs89x0var.h | 4 +-
sys/dev/ic/dp8390.c | 17 +-
sys/dev/ic/dp8390var.h | 7 +-
sys/dev/ic/elink3.c | 13 +-
sys/dev/ic/elink3var.h | 8 +-
sys/dev/ic/elinkxl.c | 14 +-
sys/dev/ic/elinkxlvar.h | 8 +-
sys/dev/ic/gem.c | 10 +-
sys/dev/ic/gemvar.h | 8 +-
sys/dev/ic/hme.c | 11 +-
sys/dev/ic/hmevar.h | 7 +-
sys/dev/ic/i82557.c | 14 +-
sys/dev/ic/i82557var.h | 5 +-
sys/dev/ic/lan9118.c | 15 +-
sys/dev/ic/lan9118var.h | 8 +-
sys/dev/ic/lance.c | 10 +-
sys/dev/ic/lancevar.h | 8 +-
sys/dev/ic/ld_aac.c | 8 +-
sys/dev/ic/ld_cac.c | 8 +-
sys/dev/ic/ld_icp.c | 8 +-
sys/dev/ic/ld_mlx.c | 8 +-
sys/dev/ic/lemac.c | 11 +-
sys/dev/ic/lemacvar.h | 8 +-
sys/dev/ic/mb86950.c | 12 +-
sys/dev/ic/mb86950var.h | 4 +-
sys/dev/ic/mb86960.c | 15 +-
sys/dev/ic/mb86960var.h | 8 +-
sys/dev/ic/mtd803.c | 15 +-
sys/dev/ic/mtd803var.h | 5 +-
sys/dev/ic/pckbc.c | 16 +-
sys/dev/ic/pckbcvar.h | 7 +-
sys/dev/ic/rtl81x9.c | 16 +-
sys/dev/ic/rtl81x9var.h | 9 +-
sys/dev/ic/seeq8005.c | 12 +-
sys/dev/ic/seeq8005var.h | 7 +-
sys/dev/ic/smc91cxx.c | 14 +-
sys/dev/ic/smc91cxxvar.h | 9 +-
sys/dev/ic/tulip.c | 13 +-
sys/dev/ic/tulipvar.h | 8 +-
sys/dev/isa/cs89x0isa.c | 7 +-
sys/dev/isa/fd.c | 14 +-
sys/dev/isa/fdc_isa.c | 8 +-
sys/dev/isa/fdvar.h | 8 +-
sys/dev/isa/if_cs_isa.c | 7 +-
sys/dev/isa/if_eg.c | 13 +-
sys/dev/isa/if_el.c | 13 +-
sys/dev/isa/if_iy.c | 13 +-
sys/dev/isa/if_tscs_isa.c | 7 +-
sys/dev/isapnp/if_cs_isapnp.c | 7 +-
sys/dev/ld.c | 14 +-
sys/dev/ldvar.h | 8 +-
sys/dev/marvell/if_gfe.c | 9 +-
sys/dev/marvell/if_gfevar.h | 4 +-
sys/dev/marvell/if_mvgbe.c | 17 +-
sys/dev/mca/ed_mca.c | 10 +-
sys/dev/mca/edc_mca.c | 10 +-
sys/dev/mca/edvar.h | 4 +-
sys/dev/ofisa/if_cs_ofisa.c | 7 +-
sys/dev/pci/hifn7751.c | 10 +-
sys/dev/pci/if_bce.c | 16 +-
sys/dev/pci/if_bge.c | 17 +-
sys/dev/pci/if_bgevar.h | 4 +-
sys/dev/pci/if_cas.c | 10 +-
sys/dev/pci/if_casvar.h | 4 +-
sys/dev/pci/if_de.c | 13 +-
sys/dev/pci/if_devar.h | 7 +-
sys/dev/pci/if_dge.c | 17 +-
sys/dev/pci/if_fxp_pci.c | 8 +-
sys/dev/pci/if_jme.c | 17 +-
sys/dev/pci/if_msk.c | 15 +-
sys/dev/pci/if_mskvar.h | 8 +-
sys/dev/pci/if_pcn.c | 17 +-
sys/dev/pci/if_sip.c | 21 +-
sys/dev/pci/if_sk.c | 15 +-
sys/dev/pci/if_skvar.h | 8 +-
sys/dev/pci/if_tl.c | 14 +-
sys/dev/pci/if_tlvar.h | 8 +-
sys/dev/pci/if_vr.c | 18 +-
sys/dev/pci/if_vte.c | 15 +-
sys/dev/pci/if_vtevar.h | 4 +-
sys/dev/pci/if_wm.c | 17 +-
sys/dev/pci/if_xge.c | 7 +-
sys/dev/pci/ld_amr.c | 8 +-
sys/dev/pci/ld_twa.c | 8 +-
sys/dev/pci/ld_twe.c | 8 +-
sys/dev/pci/ld_virtio.c | 8 +-
sys/dev/pcmcia/if_cs_pcmcia.c | 7 +-
sys/dev/pcmcia/if_xi.c | 13 +-
sys/dev/pcmcia/if_xivar.h | 8 +-
sys/dev/rnd.c | 979 -------------------------
sys/dev/rndpool.c | 311 --------
sys/dev/sbus/be.c | 7 +-
sys/dev/sbus/qe.c | 7 +-
sys/dev/scsipi/cd.c | 14 +-
sys/dev/scsipi/cdvar.h | 4 +-
sys/dev/scsipi/sd.c | 28 +-
sys/dev/scsipi/sdvar.h | 8 +-
sys/dev/scsipi/st.c | 10 +-
sys/dev/scsipi/st_atapi.c | 6 +-
sys/dev/scsipi/st_scsi.c | 6 +-
sys/dev/scsipi/stvar.h | 7 +-
sys/dev/sdmmc/ld_sdmmc.c | 7 +-
sys/dev/sysmon/sysmon_power.c | 13 +-
sys/dev/usb/if_aue.c | 11 +-
sys/dev/usb/if_auereg.h | 4 +-
sys/dev/usb/if_axe.c | 11 +-
sys/dev/usb/if_axereg.h | 4 +-
sys/dev/usb/if_cdce.c | 6 +-
sys/dev/usb/if_cdcereg.h | 4 +-
sys/dev/usb/if_cue.c | 11 +-
sys/dev/usb/if_cuereg.h | 4 +-
sys/dev/usb/if_kue.c | 11 +-
sys/dev/usb/if_kuereg.h | 4 +-
sys/dev/usb/if_udav.c | 11 +-
sys/dev/usb/if_udavreg.h | 4 +-
sys/dev/usb/if_upl.c | 13 +-
sys/dev/usb/if_url.c | 11 +-
sys/dev/usb/if_urlreg.h | 4 +-
sys/dev/usb/ucom.c | 17 +-
sys/dev/usb/uhidev.c | 12 +-
sys/dev/usb/uhidev.h | 8 +-
sys/kern/init_main.c | 6 +-
sys/kern/kern_rndpool.c | 311 ++++++++
sys/kern/kern_rndq.c | 1034 +++++++++++++++++++++++++++
sys/lib/libkern/arc4random.c | 4 +-
sys/modules/if_axe/Makefile | 4 +-
sys/netinet/tcp_usrreq.c | 8 +-
sys/netinet/tcp_var.h | 6 +-
sys/rump/dev/lib/librnd/Makefile | 4 +-
sys/rump/librump/rumpkern/Makefile.rumpkern | 4 +-
sys/sys/rnd.h | 21 +-
sys/uvm/uvm.h | 8 +-
sys/uvm/uvm_fault.c | 65 +-
sys/uvm/uvm_page.c | 14 +-
204 files changed, 1994 insertions(+), 2699 deletions(-)
diffs (truncated from 11048 to 300 lines):
diff -r 8d3761dbeea8 -r 81f6d7a32a7e sbin/rndctl/rndctl.c
--- a/sbin/rndctl/rndctl.c Thu Feb 02 19:35:18 2012 +0000
+++ b/sbin/rndctl/rndctl.c Thu Feb 02 19:42:57 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rndctl.c,v 1.23 2011/12/17 13:18:20 apb Exp $ */
+/* $NetBSD: rndctl.c,v 1.24 2012/02/02 19:42:57 tls Exp $ */
/*-
* Copyright (c) 1997 Michael Graff.
@@ -33,7 +33,7 @@
#include <sha1.h>
#ifndef lint
-__RCSID("$NetBSD: rndctl.c,v 1.23 2011/12/17 13:18:20 apb Exp $");
+__RCSID("$NetBSD: rndctl.c,v 1.24 2012/02/02 19:42:57 tls Exp $");
#endif
@@ -62,6 +62,10 @@
{ "tape", RND_TYPE_TAPE },
{ "tty", RND_TYPE_TTY },
{ "rng", RND_TYPE_RNG },
+ { "skew", RND_TYPE_SKEW },
+ { "env", RND_TYPE_ENV },
+ { "vm", RND_TYPE_VM },
+ { "power", RND_TYPE_POWER },
{ NULL, 0 }
};
diff -r 8d3761dbeea8 -r 81f6d7a32a7e sys/arch/acorn26/ioc/arckbd.c
--- a/sys/arch/acorn26/ioc/arckbd.c Thu Feb 02 19:35:18 2012 +0000
+++ b/sys/arch/acorn26/ioc/arckbd.c Thu Feb 02 19:42:57 2012 +0000
@@ -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 @@
#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 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 @@
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 @@
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 @@
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 -r 8d3761dbeea8 -r 81f6d7a32a7e sys/arch/acorn32/eb7500atx/if_cs.c
--- a/sys/arch/acorn32/eb7500atx/if_cs.c Thu Feb 02 19:35:18 2012 +0000
+++ b/sys/arch/acorn32/eb7500atx/if_cs.c Thu Feb 02 19:42:57 2012 +0000
@@ -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 @@
#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 -r 8d3761dbeea8 -r 81f6d7a32a7e sys/arch/alpha/sableio/fdc_sableio.c
--- a/sys/arch/alpha/sableio/fdc_sableio.c Thu Feb 02 19:35:18 2012 +0000
+++ b/sys/arch/alpha/sableio/fdc_sableio.c Thu Feb 02 19:42:57 2012 +0000
@@ -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 -r 8d3761dbeea8 -r 81f6d7a32a7e sys/arch/arm/at91/at91dbgu.c
--- a/sys/arch/arm/at91/at91dbgu.c Thu Feb 02 19:35:18 2012 +0000
+++ b/sys/arch/arm/at91/at91dbgu.c Thu Feb 02 19:42:57 2012 +0000
@@ -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 @@
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 @@
/* 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 -r 8d3761dbeea8 -r 81f6d7a32a7e sys/arch/arm/at91/at91dbguvar.h
--- a/sys/arch/arm/at91/at91dbguvar.h Thu Feb 02 19:35:18 2012 +0000
+++ b/sys/arch/arm/at91/at91dbguvar.h Thu Feb 02 19:42:57 2012 +0000
@@ -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 @@
int (*disable)(struct at91dbgu_softc *);
int enabled;
-#if NRND > 0 && defined(RND_COM)
+#ifdef RND_COM
krndsource_t rnd_source;
#endif
};
diff -r 8d3761dbeea8 -r 81f6d7a32a7e sys/arch/arm/at91/at91usart.c
--- a/sys/arch/arm/at91/at91usart.c Thu Feb 02 19:35:18 2012 +0000
+++ b/sys/arch/arm/at91/at91usart.c Thu Feb 02 19:42:57 2012 +0000
@@ -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 @@
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 -r 8d3761dbeea8 -r 81f6d7a32a7e sys/arch/arm/at91/at91usartvar.h
--- a/sys/arch/arm/at91/at91usartvar.h Thu Feb 02 19:35:18 2012 +0000
+++ b/sys/arch/arm/at91/at91usartvar.h Thu Feb 02 19:42:57 2012 +0000
@@ -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 @@
int (*disable)(struct at91usart_softc *);
int enabled;
-#if NRND > 0 && defined(RND_COM)
+#ifdef RND_COM
krndsource_t rnd_source;
#endif
};
diff -r 8d3761dbeea8 -r 81f6d7a32a7e sys/arch/arm/ep93xx/epcom.c
--- a/sys/arch/arm/ep93xx/epcom.c Thu Feb 02 19:35:18 2012 +0000
+++ b/sys/arch/arm/ep93xx/epcom.c Thu Feb 02 19:42:57 2012 +0000
@@ -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)
Home |
Main Index |
Thread Index |
Old Index