On Sun, May 30, 2021 at 05:01:05AM +0000, Visa Hankala wrote: > The kernel has places where mutexes are used but <sys/mutex.h> is not > included directly. Some of them get exposed when #include <sys/mutex.h> > is removed from soft interrupt headers. The following diff fixes them. > > OK?
ok jsg@ > > Index: arch/amd64/amd64/db_interface.c > =================================================================== > RCS file: src/sys/arch/amd64/amd64/db_interface.c,v > retrieving revision 1.35 > diff -u -p -r1.35 db_interface.c > --- arch/amd64/amd64/db_interface.c 6 Nov 2019 07:34:35 -0000 1.35 > +++ arch/amd64/amd64/db_interface.c 30 May 2021 04:28:45 -0000 > @@ -36,6 +36,7 @@ > #include <sys/param.h> > #include <sys/reboot.h> > #include <sys/systm.h> > +#include <sys/mutex.h> > > #include <uvm/uvm_extern.h> > > Index: arch/arm64/arm64/db_interface.c > =================================================================== > RCS file: src/sys/arch/arm64/arm64/db_interface.c,v > retrieving revision 1.9 > diff -u -p -r1.9 db_interface.c > --- arch/arm64/arm64/db_interface.c 11 Mar 2021 11:16:55 -0000 1.9 > +++ arch/arm64/arm64/db_interface.c 30 May 2021 04:28:45 -0000 > @@ -39,6 +39,7 @@ > #include <sys/reboot.h> > #include <sys/systm.h> /* just for boothowto */ > #include <sys/exec.h> > +#include <sys/mutex.h> > > #include <uvm/uvm_extern.h> > > Index: arch/arm64/dev/apldart.c > =================================================================== > RCS file: src/sys/arch/arm64/dev/apldart.c,v > retrieving revision 1.3 > diff -u -p -r1.3 apldart.c > --- arch/arm64/dev/apldart.c 24 May 2021 18:38:29 -0000 1.3 > +++ arch/arm64/dev/apldart.c 30 May 2021 04:28:45 -0000 > @@ -20,6 +20,7 @@ > #include <sys/device.h> > #include <sys/extent.h> > #include <sys/malloc.h> > +#include <sys/mutex.h> > > #include <machine/intr.h> > #include <machine/bus.h> > Index: arch/mips64/mips64/db_machdep.c > =================================================================== > RCS file: src/sys/arch/mips64/mips64/db_machdep.c,v > retrieving revision 1.56 > diff -u -p -r1.56 db_machdep.c > --- arch/mips64/mips64/db_machdep.c 1 May 2021 16:11:11 -0000 1.56 > +++ arch/mips64/mips64/db_machdep.c 30 May 2021 04:28:46 -0000 > @@ -28,6 +28,7 @@ > > #include <sys/param.h> > #include <sys/systm.h> > +#include <sys/mutex.h> > #include <sys/proc.h> > #include <dev/cons.h> > > Index: arch/powerpc/ddb/db_interface.c > =================================================================== > RCS file: src/sys/arch/powerpc/ddb/db_interface.c,v > retrieving revision 1.6 > diff -u -p -r1.6 db_interface.c > --- arch/powerpc/ddb/db_interface.c 7 Nov 2019 15:58:39 -0000 1.6 > +++ arch/powerpc/ddb/db_interface.c 30 May 2021 04:28:46 -0000 > @@ -32,6 +32,7 @@ > #include <sys/param.h> > #include <sys/proc.h> > #include <sys/systm.h> > +#include <sys/mutex.h> > > #include <dev/cons.h> > > Index: arch/powerpc64/powerpc64/db_interface.c > =================================================================== > RCS file: src/sys/arch/powerpc64/powerpc64/db_interface.c,v > retrieving revision 1.3 > diff -u -p -r1.3 db_interface.c > --- arch/powerpc64/powerpc64/db_interface.c 22 Jul 2020 20:41:26 -0000 > 1.3 > +++ arch/powerpc64/powerpc64/db_interface.c 30 May 2021 04:28:46 -0000 > @@ -31,6 +31,7 @@ > > #include <sys/param.h> > #include <sys/systm.h> > +#include <sys/mutex.h> > > #include <dev/cons.h> > #include <dev/ofw/fdt.h> > Index: arch/sparc64/sparc64/db_interface.c > =================================================================== > RCS file: src/sys/arch/sparc64/sparc64/db_interface.c,v > retrieving revision 1.55 > diff -u -p -r1.55 db_interface.c > --- arch/sparc64/sparc64/db_interface.c 30 Jan 2020 08:51:27 -0000 > 1.55 > +++ arch/sparc64/sparc64/db_interface.c 30 May 2021 04:28:46 -0000 > @@ -35,6 +35,7 @@ > #include <sys/reboot.h> > #include <sys/systm.h> > #include <sys/malloc.h> > +#include <sys/mutex.h> > > #include <dev/cons.h> > > Index: dev/fdt/bcm2835_mbox.c > =================================================================== > RCS file: src/sys/dev/fdt/bcm2835_mbox.c,v > retrieving revision 1.1 > diff -u -p -r1.1 bcm2835_mbox.c > --- dev/fdt/bcm2835_mbox.c 19 Apr 2020 14:51:52 -0000 1.1 > +++ dev/fdt/bcm2835_mbox.c 30 May 2021 04:28:46 -0000 > @@ -48,6 +48,7 @@ > > #include <sys/types.h> > #include <sys/systm.h> > +#include <sys/mutex.h> > > #include <machine/bus.h> > #include <machine/fdt.h> > Index: dev/ic/ahcivar.h > =================================================================== > RCS file: src/sys/dev/ic/ahcivar.h,v > retrieving revision 1.10 > diff -u -p -r1.10 ahcivar.h > --- dev/ic/ahcivar.h 21 Aug 2017 21:43:46 -0000 1.10 > +++ dev/ic/ahcivar.h 30 May 2021 04:28:46 -0000 > @@ -18,6 +18,7 @@ > * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. > */ > > +#include <sys/mutex.h> > #include <sys/timeout.h> > #include <dev/ata/atascsi.h> > #include <dev/ata/pmreg.h> > >
