Module Name: src
Committed By: martin
Date: Tue Aug 1 14:57:27 UTC 2023
Modified Files:
src/sys/dev/isapnp [netbsd-10]: sb_isapnp.c
src/sys/dev/ofisa [netbsd-10]: sb_ofisa.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #286):
sys/dev/isapnp/sb_isapnp.c: revision 1.54
sys/dev/ofisa/sb_ofisa.c: revision 1.24
sb(4): Fix missing mutex initialization at isapnp and ofisa.
PR kern/57363
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.53.28.1 src/sys/dev/isapnp/sb_isapnp.c
cvs rdiff -u -r1.23 -r1.23.18.1 src/sys/dev/ofisa/sb_ofisa.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/isapnp/sb_isapnp.c
diff -u src/sys/dev/isapnp/sb_isapnp.c:1.53 src/sys/dev/isapnp/sb_isapnp.c:1.53.28.1
--- src/sys/dev/isapnp/sb_isapnp.c:1.53 Wed May 8 13:40:18 2019
+++ src/sys/dev/isapnp/sb_isapnp.c Tue Aug 1 14:57:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sb_isapnp.c,v 1.53 2019/05/08 13:40:18 isaki Exp $ */
+/* $NetBSD: sb_isapnp.c,v 1.53.28.1 2023/08/01 14:57:27 martin Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,v 1.53 2019/05/08 13:40:18 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,v 1.53.28.1 2023/08/01 14:57:27 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -158,6 +158,9 @@ sb_isapnp_attach(device_t parent, device
return;
}
+ mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
+
sc->sc_ih = isa_intr_establish(ipa->ipa_ic, ipa->ipa_irq[0].num,
ipa->ipa_irq[0].type, IPL_AUDIO, sbdsp_intr, sc);
Index: src/sys/dev/ofisa/sb_ofisa.c
diff -u src/sys/dev/ofisa/sb_ofisa.c:1.23 src/sys/dev/ofisa/sb_ofisa.c:1.23.18.1
--- src/sys/dev/ofisa/sb_ofisa.c:1.23 Wed Jan 27 03:10:21 2021
+++ src/sys/dev/ofisa/sb_ofisa.c Tue Aug 1 14:57:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sb_ofisa.c,v 1.23 2021/01/27 03:10:21 thorpej Exp $ */
+/* $NetBSD: sb_ofisa.c,v 1.23.18.1 2023/08/01 14:57:27 martin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.23 2021/01/27 03:10:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.23.18.1 2023/08/01 14:57:27 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -170,6 +170,9 @@ sb_ofisa_attach(device_t parent, device_
return;
}
+ mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
+
sc->sc_ih = isa_intr_establish(aa->ic, intr.irq, IST_EDGE, IPL_AUDIO,
sbdsp_intr, sc);
