Module Name: src
Committed By: mrg
Date: Sat May 9 08:08:50 UTC 2015
Modified Files:
src/sys/dev/pci: hifn7751.c
Log Message:
initialise sc_mtx slightly earlier, before it is used on systems with rng.
fixes problem reported by msaitoh@.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 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.58 src/sys/dev/pci/hifn7751.c:1.59
--- src/sys/dev/pci/hifn7751.c:1.58 Mon Apr 27 17:38:01 2015
+++ src/sys/dev/pci/hifn7751.c Sat May 9 08:08:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: hifn7751.c,v 1.58 2015/04/27 17:38:01 christos Exp $ */
+/* $NetBSD: hifn7751.c,v 1.59 2015/05/09 08:08:50 mrg 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.58 2015/04/27 17:38:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.59 2015/05/09 08:08:50 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -433,13 +433,13 @@ hifn_attach(device_t parent, device_t se
sc->sc_dmamap->dm_mapsize,
BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+ mutex_init(&sc->sc_mtx, MUTEX_DEFAULT, IPL_VM);
+
if (sc->sc_flags & (HIFN_HAS_PUBLIC | HIFN_HAS_RNG)) {
hifn_init_pubrng(sc);
sc->sc_rng_need = RND_POOLBITS / NBBY;
}
- mutex_init(&sc->sc_mtx, MUTEX_DEFAULT, IPL_VM);
-
#ifdef __OpenBSD__
timeout_set(&sc->sc_tickto, hifn_tick, sc);
timeout_add(&sc->sc_tickto, hz);
