Module Name: src
Committed By: msaitoh
Date: Mon May 11 03:14:29 UTC 2015
Modified Files:
src/sys/dev/pci [netbsd-7]: hifn7751.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.56.2.1 src/sys/dev/pci/hifn7751.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/hifn7751.c
diff -u src/sys/dev/pci/hifn7751.c:1.56 src/sys/dev/pci/hifn7751.c:1.56.2.1
--- src/sys/dev/pci/hifn7751.c:1.56 Sun Aug 10 16:44:35 2014
+++ src/sys/dev/pci/hifn7751.c Mon May 11 03:14:29 2015
@@ -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 @@ hifn_rng_get(size_t bytes, void *priv)
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);
}
