[src/netbsd-7]: src/sys/dev/pci Pull up following revision(s) (requested by r...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/02c1db42a907
branches:  netbsd-7
changeset: 799298:02c1db42a907
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon May 11 03:14:29 2015 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #748):
        sys/dev/pci/hifn7751.c: revision 1.60
Defer to a callout in hifn_rng_get.  Fixes lock-against-self.
Still can't call rnd_add_data directly from an rndsource callback.
(Still plan to fix this with further rnd rototilling.)
XXX pullup netbsd-7

diffstat:

 sys/dev/pci/hifn7751.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 27fe5ad825cb -r 02c1db42a907 sys/dev/pci/hifn7751.c
--- a/sys/dev/pci/hifn7751.c    Sat May 09 13:56:41 2015 +0000
+++ b/sys/dev/pci/hifn7751.c    Mon May 11 03:14:29 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hifn7751.c,v 1.56 2014/08/10 16:44:35 tls Exp $        */
+/*     $NetBSD: hifn7751.c,v 1.56.2.1 2015/05/11 03:14:29 msaitoh Exp $        */
 /*     $FreeBSD: hifn7751.c,v 1.5.2.7 2003/10/08 23:52:00 sam Exp $ */
 /*     $OpenBSD: hifn7751.c,v 1.140 2003/08/01 17:55:54 deraadt Exp $  */
 
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.56 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.56.2.1 2015/05/11 03:14:29 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -537,8 +537,7 @@
 
        mutex_enter(&sc->sc_mtx);
        sc->sc_rng_need = bytes;
-
-       hifn_rng_locked(sc);
+       callout_reset(&sc->sc_rngto, 0, hifn_rng, sc);
        mutex_exit(&sc->sc_mtx);
 }