Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/tls-earlyentropy]: src Be a little more clear and consistent about harve...



details:   https://anonhg.NetBSD.org/src/rev/89a4f080cadd
branches:  tls-earlyentropy
changeset: 795268:89a4f080cadd
user:      tls <tls%NetBSD.org@localhost>
date:      Mon Apr 07 03:37:29 2014 +0000

description:
Be a little more clear and consistent about harvesting entropy from devices:

1) deprecate RND_FLAG_NO_ESTIMATE

2) define RND_FLAG_COLLECT_TIME, RND_FLAG_COLLECT_VALUE

3) define RND_FLAG_ESTIMATE_TIME, RND_FLAG_ESTIMATE_VALUE

4) define RND_FLAG_DEFAULT: RND_FLAG_COLLECT_TIME|
   RND_FLAG_COLLECT_VALUE|RND_FLAG_ESTIMATE_TIME

5) Make entropy harvesting from environmental sensors a little more generic
   and remove it from individual sensor drivers.

6) Remove individual open-coded delta-estimators for values from a few
   places in the tree (uvm, environmental drivers).

7) 0 -> RND_FLAG_DEFAULT, actually gather entropy from various drivers
   that had stubbed out code, other minor cleanups.

diffstat:

 share/man/man9/rnd.9                     |  31 ++++++++++++++++++++-----
 sys/arch/acorn26/ioc/arckbd.c            |   8 ++++--
 sys/arch/arm/at91/at91dbgu.c             |   8 +++---
 sys/arch/arm/at91/at91usart.c            |   8 +++---
 sys/arch/arm/broadcom/bcm2835_rng.c      |   6 ++--
 sys/arch/arm/broadcom/bcm53xx_rng.c      |   4 +-
 sys/arch/arm/clps711x/clpscom.c          |   6 ++--
 sys/arch/arm/ep93xx/epcom.c              |   6 ++--
 sys/arch/arm/imx/imxuart.c               |   7 +++--
 sys/arch/arm/ixp12x0/ixp12x0_com.c       |   7 +++--
 sys/arch/arm/s3c2xx0/sscom.c             |   7 +++--
 sys/arch/arm/sa11x0/sa1111_kbc.c         |   6 ++--
 sys/arch/arm/sa11x0/sa11x0_com.c         |   7 +++--
 sys/arch/arm/xscale/ixp425_if_npe.c      |   6 ++--
 sys/arch/emips/ebus/ace_ebus.c           |   8 +++---
 sys/arch/emips/ebus/flash_ebus.c         |   8 +++---
 sys/arch/emips/ebus/if_le_ebus.c         |   6 ++--
 sys/arch/epoc32/windermere/wmcom.c       |   6 ++--
 sys/arch/evbarm/dev/plcom.c              |   6 ++--
 sys/arch/hp300/dev/rd.c                  |   6 ++--
 sys/arch/hppa/gsc/harmony.c              |   4 +-
 sys/arch/i386/pci/glxsb.c                |   9 ++++---
 sys/arch/macppc/dev/if_gm.c              |   7 +++--
 sys/arch/mips/alchemy/dev/if_aumac.c     |   6 ++--
 sys/arch/mips/atheros/dev/if_ae.c        |   6 ++--
 sys/arch/mips/sibyte/dev/sbscn.c         |   7 +++--
 sys/arch/next68k/dev/mb8795.c            |   6 ++--
 sys/arch/playstation2/dev/if_smap.c      |   6 ++--
 sys/arch/sgimips/mace/if_mec.c           |   6 ++--
 sys/arch/sun2/dev/if_ec.c                |   6 ++--
 sys/arch/x68k/dev/fd.c                   |   6 ++--
 sys/arch/x86/pci/fwhrng.c                |   6 ++--
 sys/arch/x86/x86/ipmi.c                  |  27 +++-------------------
 sys/arch/x86/x86/via_padlock.c           |   7 ++---
 sys/arch/x86/x86/viac7temp.c             |   6 ++--
 sys/arch/xen/xen/if_xennet_xenbus.c      |   6 ++--
 sys/arch/xen/xen/xbd_xenbus.c            |   8 +++---
 sys/dev/ata/wd.c                         |   6 ++--
 sys/dev/gpib/rd.c                        |   6 ++--
 sys/dev/i2c/dbcool.c                     |   7 ++++-
 sys/dev/ic/com.c                         |   6 ++--
 sys/dev/ic/cs89x0.c                      |   6 ++--
 sys/dev/ic/dp8390.c                      |   6 ++--
 sys/dev/ic/elink3.c                      |   6 ++--
 sys/dev/ic/elinkxl.c                     |   6 ++--
 sys/dev/ic/gem.c                         |   6 ++--
 sys/dev/ic/hme.c                         |   6 ++--
 sys/dev/ic/i82557.c                      |   6 ++--
 sys/dev/ic/lan9118.c                     |   6 ++--
 sys/dev/ic/lance.c                       |   6 ++--
 sys/dev/ic/lemac.c                       |   6 ++--
 sys/dev/ic/mb86950.c                     |   6 ++--
 sys/dev/ic/mb86960.c                     |   6 ++--
 sys/dev/ic/mtd803.c                      |   6 ++--
 sys/dev/ic/pckbc.c                       |   6 ++--
 sys/dev/ic/rtl8169.c                     |   6 ++--
 sys/dev/ic/rtl81x9.c                     |   6 ++--
 sys/dev/ic/seeq8005.c                    |   6 ++--
 sys/dev/ic/smc91cxx.c                    |   6 ++--
 sys/dev/ic/tulip.c                       |   6 ++--
 sys/dev/isa/fd.c                         |   6 ++--
 sys/dev/isa/if_eg.c                      |   6 ++--
 sys/dev/isa/if_el.c                      |   6 ++--
 sys/dev/isa/if_iy.c                      |   6 ++--
 sys/dev/ld.c                             |   6 ++--
 sys/dev/marvell/if_gfe.c                 |   6 ++--
 sys/dev/marvell/if_mvgbe.c               |   6 ++--
 sys/dev/mca/ed_mca.c                     |   6 ++--
 sys/dev/pci/amdpm.c                      |  17 ++-----------
 sys/dev/pci/auich.c                      |   7 ++++-
 sys/dev/pci/hifn7751.c                   |  17 ++-----------
 sys/dev/pci/if_bce.c                     |   6 ++--
 sys/dev/pci/if_bge.c                     |   6 ++--
 sys/dev/pci/if_cas.c                     |   6 ++--
 sys/dev/pci/if_de.c                      |   6 ++--
 sys/dev/pci/if_dge.c                     |   6 ++--
 sys/dev/pci/if_jme.c                     |   6 ++--
 sys/dev/pci/if_msk.c                     |   6 ++--
 sys/dev/pci/if_pcn.c                     |   6 ++--
 sys/dev/pci/if_sip.c                     |   6 ++--
 sys/dev/pci/if_sk.c                      |   6 ++--
 sys/dev/pci/if_tl.c                      |   6 ++--
 sys/dev/pci/if_vr.c                      |   6 ++--
 sys/dev/pci/if_vte.c                     |   6 ++--
 sys/dev/pci/if_wm.c                      |   7 +++--
 sys/dev/pci/ubsec.c                      |   6 ++--
 sys/dev/pci/viaenv.c                     |   5 ++-
 sys/dev/pcmcia/if_xi.c                   |   6 ++--
 sys/dev/scsipi/cd.c                      |   6 ++--
 sys/dev/scsipi/sd.c                      |   6 ++--
 sys/dev/scsipi/st.c                      |   6 ++--
 sys/dev/sysmon/sysmon_envsys.c           |  38 ++++++++++++++++++++++++++++---
 sys/dev/sysmon/sysmon_power.c            |   6 ++--
 sys/dev/usb/if_aue.c                     |   6 ++--
 sys/dev/usb/if_axe.c                     |   6 ++--
 sys/dev/usb/if_axen.c                    |   6 ++--
 sys/dev/usb/if_cue.c                     |   6 ++--
 sys/dev/usb/if_kue.c                     |   6 ++--
 sys/dev/usb/if_smsc.c                    |   4 +-
 sys/dev/usb/if_udav.c                    |   6 ++--
 sys/dev/usb/if_upl.c                     |   6 ++--
 sys/dev/usb/if_url.c                     |   6 ++--
 sys/dev/usb/ucom.c                       |   6 ++--
 sys/dev/usb/uhidev.c                     |   7 +++--
 sys/rump/librump/rumpkern/hyperentropy.c |   8 +++---
 sys/uvm/uvm.h                            |   5 +---
 sys/uvm/uvm_fault.c                      |  38 ++-----------------------------
 sys/uvm/uvm_page.c                       |   8 ++++--
 usr.bin/fstat/misc.c                     |   6 ++--
 109 files changed, 399 insertions(+), 409 deletions(-)

diffs (truncated from 3162 to 300 lines):

diff -r 459a84f10617 -r 89a4f080cadd share/man/man9/rnd.9
--- a/share/man/man9/rnd.9      Mon Apr 07 02:54:53 2014 +0000
+++ b/share/man/man9/rnd.9      Mon Apr 07 03:37:29 2014 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: rnd.9,v 1.22 2012/07/12 00:07:36 pgoyette Exp $
+.\"    $NetBSD: rnd.9,v 1.22.8.1 2014/04/07 03:37:29 tls Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -100,15 +100,32 @@
 .Pp
 .Fa flags
 are the logical OR of
-.Dv RND_FLAG_NO_COLLECT
-(don't collect or estimate)
-.Dv RND_FLAG_NO_ESTIMATE
-(don't estimate)
-to control the default setting for collection and estimation.
+.Dv RND_FLAG_COLLECT_VALUE
+(mix data provided by this source into the pool)
+.Dv RND_FLAG_COLLECT_TIME
+(mix timestamps from this source into the pool)
+.Dv RND_FLAG_ESTIMATE_VALUE
+(use a delta estimator to count bits of entropy from this source's data towards
+the pool estimate)
+.Dv RND_FLAG_ESTIMATE_TIME
+(use a delta estimator to count bits of entropy from this source's timestamps
+towards the pool estimate).
+For many devices,
+.Dv RND_FLAG_DEFAULT
+(
+.Dv RND_FLAG_COLLECT_VALUE
+|
+.Dv RND_FLAG_COLLECT_TIME
+|
+.Dv RND_FLAG_ESTIMATE_TIME
+) is the best choice.
 Note that devices of type
 .Dv RND_TYPE_NET
 default to
-.Dv RND_FLAG_NO_ESTIMATE .
+.Dv RND_FLAG_COLLECT_VALUE
+|
+.Dv RND_FLAG_COLLECT_TIME
+(no entropy counted).
 .Pp
 .It Fn rnd_detach_source "krndsource_t *rnd_source"
 This function disconnects the device from entropy collection.
diff -r 459a84f10617 -r 89a4f080cadd sys/arch/acorn26/ioc/arckbd.c
--- a/sys/arch/acorn26/ioc/arckbd.c     Mon Apr 07 02:54:53 2014 +0000
+++ b/sys/arch/acorn26/ioc/arckbd.c     Mon Apr 07 03:37:29 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: arckbd.c,v 1.22 2012/02/02 19:42:57 tls Exp $ */
+/* $NetBSD: arckbd.c,v 1.22.20.1 2014/04/07 03:37:29 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.22 2012/02/02 19:42:57 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arckbd.c,v 1.22.20.1 2014/04/07 03:37:29 tls Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -219,8 +219,10 @@
 
        aprint_normal("\n");
 
+       /* XXX We do not ESTIMATE_VALUE because we are feeding two
+          data streams (mouse, kbd) into the same source. XXX */
        rnd_attach_source(&sc->sc_rnd_source, device_xname(self),
-           RND_TYPE_TTY, 0);
+           RND_TYPE_TTY, RND_FLAG_DEFAULT);
 
        wskbdargs.console = 1; /* XXX FIXME */
        wskbdargs.keymap = &sc->sc_mapdata;
diff -r 459a84f10617 -r 89a4f080cadd sys/arch/arm/at91/at91dbgu.c
--- a/sys/arch/arm/at91/at91dbgu.c      Mon Apr 07 02:54:53 2014 +0000
+++ b/sys/arch/arm/at91/at91dbgu.c      Mon Apr 07 03:37:29 2014 +0000
@@ -1,5 +1,5 @@
-/*     $Id: at91dbgu.c,v 1.10 2014/03/16 05:20:22 dholland Exp $       */
-/*     $NetBSD: at91dbgu.c,v 1.10 2014/03/16 05:20:22 dholland Exp $ */
+/*     $Id: at91dbgu.c,v 1.10.2.1 2014/04/07 03:37:30 tls Exp $        */
+/*     $NetBSD: at91dbgu.c,v 1.10.2.1 2014/04/07 03:37:30 tls Exp $ */
 
 /*
  *
@@ -83,7 +83,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.10 2014/03/16 05:20:22 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.10.2.1 2014/04/07 03:37:30 tls Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -288,7 +288,7 @@
 
 #ifdef RND_COM
        rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev),
-                         RND_TYPE_TTY, 0);
+                         RND_TYPE_TTY, RND_FLAG_DEFAULT);
 #endif
 
        /* if there are no enable/disable functions, assume the device
diff -r 459a84f10617 -r 89a4f080cadd sys/arch/arm/at91/at91usart.c
--- a/sys/arch/arm/at91/at91usart.c     Mon Apr 07 02:54:53 2014 +0000
+++ b/sys/arch/arm/at91/at91usart.c     Mon Apr 07 03:37:29 2014 +0000
@@ -1,5 +1,5 @@
-/*     $Id: at91usart.c,v 1.9 2014/03/16 05:20:22 dholland Exp $       */
-/*     $NetBSD: at91usart.c,v 1.9 2014/03/16 05:20:22 dholland Exp $ */
+/*     $Id: at91usart.c,v 1.9.2.1 2014/04/07 03:37:30 tls Exp $        */
+/*     $NetBSD: at91usart.c,v 1.9.2.1 2014/04/07 03:37:30 tls Exp $ */
 
 /*
  * Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91usart.c,v 1.9 2014/03/16 05:20:22 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91usart.c,v 1.9.2.1 2014/04/07 03:37:30 tls Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -314,7 +314,7 @@
 
 #ifdef RND_COM
        rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev),
-                         RND_TYPE_TTY, 0);
+                         RND_TYPE_TTY, RND_FLAG_DEFAULT);
 #endif
 
        /* if there are no enable/disable functions, assume the device
diff -r 459a84f10617 -r 89a4f080cadd sys/arch/arm/broadcom/bcm2835_rng.c
--- a/sys/arch/arm/broadcom/bcm2835_rng.c       Mon Apr 07 02:54:53 2014 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_rng.c       Mon Apr 07 03:37:29 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bcm2835_rng.c,v 1.9 2013/08/29 21:54:11 riastradh Exp $ */
+/*     $NetBSD: bcm2835_rng.c,v 1.9.2.1 2014/04/07 03:37:30 tls Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_rng.c,v 1.9 2013/08/29 21:54:11 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_rng.c,v 1.9.2.1 2014/04/07 03:37:30 tls Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -129,7 +129,7 @@
        mutex_init(&sc->sc_rnd_lock, MUTEX_DEFAULT, IPL_SERIAL);
        rndsource_setcb(&sc->sc_rndsource, &bcmrng_get_cb, sc);
        rnd_attach_source(&sc->sc_rndsource, device_xname(self), RND_TYPE_RNG,
-           RND_FLAG_NO_ESTIMATE|RND_FLAG_HASCB);
+           RND_FLAG_COLLECT_VALUE|RND_FLAG_HASCB);
 
        /* get some initial entropy ASAP */
        bcmrng_get_cb(RND_POOLBITS / NBBY, sc);
diff -r 459a84f10617 -r 89a4f080cadd sys/arch/arm/broadcom/bcm53xx_rng.c
--- a/sys/arch/arm/broadcom/bcm53xx_rng.c       Mon Apr 07 02:54:53 2014 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_rng.c       Mon Apr 07 03:37:29 2014 +0000
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_rng.c,v 1.6 2014/02/19 22:21:16 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_rng.c,v 1.6.2.1 2014/04/07 03:37:30 tls Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -143,7 +143,7 @@
        callout_init(&sc->sc_rnd_callout, CALLOUT_MPSAFE);
 
        rnd_attach_source(&sc->sc_rnd_source, device_xname(self), RND_TYPE_RNG,
-           RND_FLAG_NO_ESTIMATE);
+           RND_FLAG_COLLECT_VALUE);
 
 #ifdef RNG_USE_INTR
        sc->sc_ih = intr_establish(loc->loc_intrs[0], IPL_VM, IST_LEVEL,
diff -r 459a84f10617 -r 89a4f080cadd sys/arch/arm/clps711x/clpscom.c
--- a/sys/arch/arm/clps711x/clpscom.c   Mon Apr 07 02:54:53 2014 +0000
+++ b/sys/arch/arm/clps711x/clpscom.c   Mon Apr 07 03:37:29 2014 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: clpscom.c,v 1.2 2014/03/16 05:20:23 dholland Exp $      */
+/*      $NetBSD: clpscom.c,v 1.2.2.1 2014/04/07 03:37:30 tls 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.2 2014/03/16 05:20:23 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clpscom.c,v 1.2.2.1 2014/04/07 03:37:30 tls Exp $");
 
 #include "rnd.h"
 
@@ -247,7 +247,7 @@
 
 #ifdef RND_COM
        rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev),
-           RND_TYPE_TTY, 0);
+           RND_TYPE_TTY, RND_FLAG_DEFAULT);
 #endif
 
        SET(sc->sc_hwflags, COM_HW_DEV_OK);
diff -r 459a84f10617 -r 89a4f080cadd sys/arch/arm/ep93xx/epcom.c
--- a/sys/arch/arm/ep93xx/epcom.c       Mon Apr 07 02:54:53 2014 +0000
+++ b/sys/arch/arm/ep93xx/epcom.c       Mon Apr 07 03:37:29 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: epcom.c,v 1.26 2014/03/16 05:20:23 dholland Exp $ */
+/*     $NetBSD: epcom.c,v 1.26.2.1 2014/04/07 03:37:30 tls Exp $ */
 /*
  * Copyright (c) 1998, 1999, 2001, 2002, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epcom.c,v 1.26 2014/03/16 05:20:23 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epcom.c,v 1.26.2.1 2014/04/07 03:37:30 tls Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -248,7 +248,7 @@
 
 #ifdef RND_COM
        rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev),
-                         RND_TYPE_TTY, 0);
+                         RND_TYPE_TTY, RND_FLAG_DEFAULT);
 #endif
 
        /* if there are no enable/disable functions, assume the device
diff -r 459a84f10617 -r 89a4f080cadd sys/arch/arm/imx/imxuart.c
--- a/sys/arch/arm/imx/imxuart.c        Mon Apr 07 02:54:53 2014 +0000
+++ b/sys/arch/arm/imx/imxuart.c        Mon Apr 07 03:37:29 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: imxuart.c,v 1.11 2014/03/16 05:20:23 dholland Exp $ */
+/* $NetBSD: imxuart.c,v 1.11.2.1 2014/04/07 03:37:30 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.11 2014/03/16 05:20:23 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imxuart.c,v 1.11.2.1 2014/04/07 03:37:30 tls Exp $");
 
 #include "opt_imxuart.h"
 #include "opt_ddb.h"
@@ -504,7 +504,8 @@
 
 #ifdef RND_COM
        rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev),
-                         RND_TYPE_TTY, 0);
+                         RND_TYPE_TTY, RND_FLAG_COLLECT_TIME |
+                                       RND_FLAG_ESTIMATE_TIME);
 #endif
 
        /* if there are no enable/disable functions, assume the device
diff -r 459a84f10617 -r 89a4f080cadd sys/arch/arm/ixp12x0/ixp12x0_com.c
--- a/sys/arch/arm/ixp12x0/ixp12x0_com.c        Mon Apr 07 02:54:53 2014 +0000
+++ b/sys/arch/arm/ixp12x0/ixp12x0_com.c        Mon Apr 07 03:37:29 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ixp12x0_com.c,v 1.43 2014/03/16 05:20:23 dholland Exp $ */
+/*     $NetBSD: ixp12x0_com.c,v 1.43.2.1 2014/04/07 03:37:30 tls Exp $ */
 /*
  * Copyright (c) 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_com.c,v 1.43 2014/03/16 05:20:23 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_com.c,v 1.43.2.1 2014/04/07 03:37:30 tls Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -247,7 +247,8 @@
 
 #ifdef RND_COM
        rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev),
-                         RND_TYPE_TTY, 0);
+                         RND_TYPE_TTY, RND_FLAG_COLLECT_TIME|
+                                       RND_FLAG_ESTIMATE_TIME);
 #endif
 
        /* if there are no enable/disable functions, assume the device
diff -r 459a84f10617 -r 89a4f080cadd sys/arch/arm/s3c2xx0/sscom.c
--- a/sys/arch/arm/s3c2xx0/sscom.c      Mon Apr 07 02:54:53 2014 +0000
+++ b/sys/arch/arm/s3c2xx0/sscom.c      Mon Apr 07 03:37:29 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sscom.c,v 1.44 2014/03/16 12:26:58 reinoud Exp $ */
+/*     $NetBSD: sscom.c,v 1.44.2.1 2014/04/07 03:37:30 tls Exp $ */



Home | Main Index | Thread Index | Old Index