CVS commit: src/external/mit/xorg/lib
Module Name:src
Committed By: rjs
Date: Thu Sep 29 18:58:04 UTC 2022
Modified Files:
src/external/mit/xorg/lib/dri.old: Makefile
src/external/mit/xorg/lib/gallium.old: Makefile
src/external/mit/xorg/lib/libGL.old: Makefile
src/external/mit/xorg/lib/libgbm.old: Makefile
Log Message:
Only include other "old" makefiles from old MesaLib ones. Ok @mrg.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/dri.old/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/gallium.old/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libGL.old/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libgbm.old/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/dri.old/Makefile
diff -u src/external/mit/xorg/lib/dri.old/Makefile:1.3 src/external/mit/xorg/lib/dri.old/Makefile:1.4
--- src/external/mit/xorg/lib/dri.old/Makefile:1.3 Mon Dec 13 20:53:22 2021
+++ src/external/mit/xorg/lib/dri.old/Makefile Thu Sep 29 18:58:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/12/13 20:53:22 christos Exp $
+# $NetBSD: Makefile,v 1.4 2022/09/29 18:58:04 rjs Exp $
# Link the mesa_dri_drivers mega driver.
@@ -438,8 +438,8 @@ LIBDPLIBS+= drm_intel ${.CURDIR}/../lib
LIBDPLIBS+= drm_radeon ${.CURDIR}/../libdrm_radeon
MESA_SRC_MODULES= main math math_xform vbo tnl swrast ss common asm_c program asm_s
-.include "../libmesa.mk"
-.include "../libglsl.mk"
+.include "../libmesa.old.mk"
+.include "../libglsl.old.mk"
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SRCS+= streaming-load-memcpy.c
Index: src/external/mit/xorg/lib/gallium.old/Makefile
diff -u src/external/mit/xorg/lib/gallium.old/Makefile:1.3 src/external/mit/xorg/lib/gallium.old/Makefile:1.4
--- src/external/mit/xorg/lib/gallium.old/Makefile:1.3 Tue Dec 14 21:37:06 2021
+++ src/external/mit/xorg/lib/gallium.old/Makefile Thu Sep 29 18:58:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/12/14 21:37:06 christos Exp $
+# $NetBSD: Makefile,v 1.4 2022/09/29 18:58:04 rjs Exp $
# Transparent struct/union broken
NOLINT=yes
@@ -952,7 +952,7 @@ CPPFLAGS.${_s}+= -I${X11SRCDIR.Mesa}/src
#SRCS+= ${GALLIUM_SOURCES.${_d}}
#. endif
-.include "../libloader.mk"
+.include "../libloader.old.mk"
.if ${BUILD_RADEON} == 1
CFLAGS+= -pthread
@@ -1108,8 +1108,8 @@ MESA_SRC_MODULES= main math vbo state_t
MESA_SRC_MODULES+= amd
.endif
-.include "../libmesa.mk"
-.include "../libglsl.mk"
+.include "../libmesa.old.mk"
+.include "../libglsl.old.mk"
# Special addition for just gallium; it misses the rest of asm_c files.
.PATH: ${X11SRCDIR.Mesa}/src/mesa/x86
Index: src/external/mit/xorg/lib/libGL.old/Makefile
diff -u src/external/mit/xorg/lib/libGL.old/Makefile:1.2 src/external/mit/xorg/lib/libGL.old/Makefile:1.3
--- src/external/mit/xorg/lib/libGL.old/Makefile:1.2 Sun Jul 11 20:53:35 2021
+++ src/external/mit/xorg/lib/libGL.old/Makefile Thu Sep 29 18:58:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/07/11 20:53:35 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2022/09/29 18:58:04 rjs Exp $
.include
@@ -126,7 +126,7 @@ CPPFLAGS.${fn}= \
SRCS.util+= u_process.c
-.include "../libloader.mk"
+.include "../libloader.old.mk"
.PATH: ${X11SRCDIR.Mesa}/src/glw
.PATH: ${X11SRCDIR.Mesa}/include/GL
Index: src/external/mit/xorg/lib/libgbm.old/Makefile
diff -u src/external/mit/xorg/lib/libgbm.old/Makefile:1.2 src/external/mit/xorg/lib/libgbm.old/Makefile:1.3
--- src/external/mit/xorg/lib/libgbm.old/Makefile:1.2 Sun Jul 11 20:53:35 2021
+++ src/external/mit/xorg/lib/libgbm.old/Makefile Thu Sep 29 18:58:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/07/11 20:53:35 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2022/09/29 18:58:04 rjs Exp $
.include
@@ -40,7 +40,7 @@ CFLAGS+= -fno-strict-aliasing -fexceptio
COPTS.gbm_dri.c+= -Wno-error
-.include "../libloader.mk"
+.include "../libloader.old.mk"
.PATH: ${X11SRCDIR.Mesa}/src/gbm/main
.PATH: ${X11SRCDIR.Mesa}/src/gbm/backends/dri
CVS commit: src/external/mit/xorg/lib
Module Name:src Committed By: rjs Date: Thu Sep 29 18:58:04 UTC 2022 Modified Files: src/external/mit/xorg/lib/dri.old: Makefile src/external/mit/xorg/lib/gallium.old: Makefile src/external/mit/xorg/lib/libGL.old: Makefile src/external/mit/xorg/lib/libgbm.old: Makefile Log Message: Only include other "old" makefiles from old MesaLib ones. Ok @mrg. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/dri.old/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/gallium.old/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libGL.old/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libgbm.old/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Thu Sep 29 18:27:42 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1534 To generate a diff of this commit: cvs rdiff -u -r1.1.2.20 -r1.1.2.21 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.4 diff -u src/doc/CHANGES-9.4:1.1.2.20 src/doc/CHANGES-9.4:1.1.2.21 --- src/doc/CHANGES-9.4:1.1.2.20 Sat Sep 24 08:11:46 2022 +++ src/doc/CHANGES-9.4 Thu Sep 29 18:27:41 2022 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.20 2022/09/24 08:11:46 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.21 2022/09/29 18:27:41 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -292,3 +292,9 @@ sys/arch/arm/sunxi/sunxi_can.c 1.10,1. receive overrun, and improve receive overrun recovery. [bouyer, ticket #1533] +sys/dev/pci/mfii.c1.28 + + mfii(4): Convert from pci_intr_map() to pci_intr_alloc(); makes + the driver use MSI/MSI-x when available. + [bouyer, ticket #1534] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Thu Sep 29 18:27:42 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1534 To generate a diff of this commit: cvs rdiff -u -r1.1.2.20 -r1.1.2.21 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Thu Sep 29 18:26:42 UTC 2022
Modified Files:
src/sys/dev/pci [netbsd-9]: mfii.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1534):
sys/dev/pci/mfii.c: revision 1.28
Convert from pci_intr_map() to pci_intr_alloc(); makes the driver use
MSI/MSI-x when available. Tested by Edgar Fu?.
To generate a diff of this commit:
cvs rdiff -u -r1.4.4.2 -r1.4.4.3 src/sys/dev/pci/mfii.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/mfii.c
diff -u src/sys/dev/pci/mfii.c:1.4.4.2 src/sys/dev/pci/mfii.c:1.4.4.3
--- src/sys/dev/pci/mfii.c:1.4.4.2 Fri Sep 16 18:27:38 2022
+++ src/sys/dev/pci/mfii.c Thu Sep 29 18:26:42 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mfii.c,v 1.4.4.2 2022/09/16 18:27:38 martin Exp $ */
+/* $NetBSD: mfii.c,v 1.4.4.3 2022/09/29 18:26:42 martin Exp $ */
/* $OpenBSD: mfii.c,v 1.58 2018/08/14 05:22:21 jmatthew Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.4.4.2 2022/09/16 18:27:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.4.4.3 2022/09/29 18:26:42 martin Exp $");
#include "bio.h"
@@ -655,7 +655,7 @@ mfii_attach(device_t parent, device_t se
struct mfii_softc *sc = device_private(self);
struct pci_attach_args *pa = aux;
pcireg_t memtype;
- pci_intr_handle_t ih;
+ pci_intr_handle_t *ihp;
char intrbuf[PCI_INTRSTR_LEN];
const char *intrstr;
u_int32_t status, scpad2, scpad3;
@@ -705,12 +705,12 @@ mfii_attach(device_t parent, device_t se
/* disable interrupts */
mfii_write(sc, MFI_OMSK, 0x);
- if (pci_intr_map(pa, ) != 0) {
+ if (pci_intr_alloc(pa, , NULL, 0)) {
aprint_error(": unable to map interrupt\n");
goto pci_unmap;
}
- intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- pci_intr_setattr(pa->pa_pc, , PCI_INTR_MPSAFE, true);
+ intrstr = pci_intr_string(pa->pa_pc, ihp[0], intrbuf, sizeof(intrbuf));
+ pci_intr_setattr(pa->pa_pc, [0], PCI_INTR_MPSAFE, true);
/* lets get started */
if (mfii_transition_firmware(sc))
@@ -819,7 +819,7 @@ mfii_attach(device_t parent, device_t se
aprint_normal("\n");
aprint_naive("\n");
- sc->sc_ih = pci_intr_establish_xname(sc->sc_pc, ih, IPL_BIO,
+ sc->sc_ih = pci_intr_establish_xname(sc->sc_pc, ihp[0], IPL_BIO,
mfii_intr, sc, DEVNAME(sc));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "can't establish interrupt");
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu Sep 29 18:26:42 UTC 2022 Modified Files: src/sys/dev/pci [netbsd-9]: mfii.c Log Message: Pull up following revision(s) (requested by bouyer in ticket #1534): sys/dev/pci/mfii.c: revision 1.28 Convert from pci_intr_map() to pci_intr_alloc(); makes the driver use MSI/MSI-x when available. Tested by Edgar Fu?. To generate a diff of this commit: cvs rdiff -u -r1.4.4.2 -r1.4.4.3 src/sys/dev/pci/mfii.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/kern
In article <9275.1664462...@jacaranda.noi.kre.to>, Robert Elz wrote: >Date:Thu, 29 Sep 2022 08:18:28 -0400 >From:"Christos Zoulas" >Message-ID: <20220929121828.06edff...@cvs.netbsd.org> > > | Log Message: > | Add fd_set_exclose(). It is probably better to do this automatically in > | fd_affix()... > >Since that only affects /dev/ptmx I'd suggest fixing it generally for all >cloning devices (and handling O_??LOCK as well) would be a better method. I think that the way to go is to: 1. Do the fd_set_exclose() in fd_affix(). That will remove most of the calls to fd_set_exclose() *and* the open-coded versions of it. 2. Move the open_setfp locking initialization code to fd_affix() and do it if fp->f_type == DTYPE_VNODE. This should enable locking in all the appropriate cloners. Best, christos
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: snj Date: Thu Sep 29 14:43:06 UTC 2022 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: 1767, 1768 To generate a diff of this commit: cvs rdiff -u -r1.1.2.152 -r1.1.2.153 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.152 src/doc/CHANGES-8.3:1.1.2.153 --- src/doc/CHANGES-8.3:1.1.2.152 Fri Sep 16 18:40:23 2022 +++ src/doc/CHANGES-8.3 Thu Sep 29 14:43:06 2022 @@ -1,4 +1,4 @@ - $NetBSD: CHANGES-8.3,v 1.1.2.152 2022/09/16 18:40:23 martin Exp $ + $NetBSD: CHANGES-8.3,v 1.1.2.153 2022/09/29 14:43:06 snj Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -2861,3 +2861,15 @@ sys/arch/x86/x86/procfs_machdep.c 1.45 and amx_int8. [msaitoh, ticket #1766] +sys/dev/pci/mpii.cpatch + + mpii(4): Convert from pci_intr_map() to pci_intr_alloc(); makes + the driver use MSI/MSI-x when available. + [bouyer, ticket #1767] + +sys/dev/pci/mfii.c1.28 + + mfii(4): Convert from pci_intr_map() to pci_intr_alloc(); makes + the driver use MSI/MSI-x when available. + [bouyer, ticket #1768] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: snj Date: Thu Sep 29 14:43:06 UTC 2022 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: 1767, 1768 To generate a diff of this commit: cvs rdiff -u -r1.1.2.152 -r1.1.2.153 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: snj Date: Thu Sep 29 14:41:43 UTC 2022 Modified Files: src/sys/dev/pci [netbsd-8]: mfii.c Log Message: Pull up following revision(s) (requested by bouyer in ticket #1768): sys/dev/pci/mfii.c: 1.28 Convert from pci_intr_map() to pci_intr_alloc(); makes the driver use MSI/MSI-x when available. Tested by Edgar Fu?. To generate a diff of this commit: cvs rdiff -u -r1.3.2.6 -r1.3.2.7 src/sys/dev/pci/mfii.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: snj
Date: Thu Sep 29 14:41:43 UTC 2022
Modified Files:
src/sys/dev/pci [netbsd-8]: mfii.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1768):
sys/dev/pci/mfii.c: 1.28
Convert from pci_intr_map() to pci_intr_alloc(); makes the driver use
MSI/MSI-x when available. Tested by Edgar Fu?.
To generate a diff of this commit:
cvs rdiff -u -r1.3.2.6 -r1.3.2.7 src/sys/dev/pci/mfii.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/mfii.c
diff -u src/sys/dev/pci/mfii.c:1.3.2.6 src/sys/dev/pci/mfii.c:1.3.2.7
--- src/sys/dev/pci/mfii.c:1.3.2.6 Fri Sep 16 18:30:15 2022
+++ src/sys/dev/pci/mfii.c Thu Sep 29 14:41:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mfii.c,v 1.3.2.6 2022/09/16 18:30:15 martin Exp $ */
+/* $NetBSD: mfii.c,v 1.3.2.7 2022/09/29 14:41:43 snj Exp $ */
/* $OpenBSD: mfii.c,v 1.58 2018/08/14 05:22:21 jmatthew Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.3.2.6 2022/09/16 18:30:15 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.3.2.7 2022/09/29 14:41:43 snj Exp $");
#include "bio.h"
@@ -654,7 +654,7 @@ mfii_attach(device_t parent, device_t se
struct mfii_softc *sc = device_private(self);
struct pci_attach_args *pa = aux;
pcireg_t memtype;
- pci_intr_handle_t ih;
+ pci_intr_handle_t *ihp;
char intrbuf[PCI_INTRSTR_LEN];
const char *intrstr;
u_int32_t status, scpad2, scpad3;
@@ -704,12 +704,12 @@ mfii_attach(device_t parent, device_t se
/* disable interrupts */
mfii_write(sc, MFI_OMSK, 0x);
- if (pci_intr_map(pa, ) != 0) {
+ if (pci_intr_alloc(pa, , NULL, 0)) {
aprint_error(": unable to map interrupt\n");
goto pci_unmap;
}
- intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- pci_intr_setattr(pa->pa_pc, , PCI_INTR_MPSAFE, true);
+ intrstr = pci_intr_string(pa->pa_pc, ihp[0], intrbuf, sizeof(intrbuf));
+ pci_intr_setattr(pa->pa_pc, [0], PCI_INTR_MPSAFE, true);
/* lets get started */
if (mfii_transition_firmware(sc))
@@ -818,7 +818,7 @@ mfii_attach(device_t parent, device_t se
aprint_normal("\n");
aprint_naive("\n");
- sc->sc_ih = pci_intr_establish_xname(sc->sc_pc, ih, IPL_BIO,
+ sc->sc_ih = pci_intr_establish_xname(sc->sc_pc, ihp[0], IPL_BIO,
mfii_intr, sc, DEVNAME(sc));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "can't establish interrupt");
Re: CVS commit: src/sys/kern
Date:Thu, 29 Sep 2022 08:18:28 -0400 From:"Christos Zoulas" Message-ID: <20220929121828.06edff...@cvs.netbsd.org> | Log Message: | Add fd_set_exclose(). It is probably better to do this automatically in | fd_affix()... Since that only affects /dev/ptmx I'd suggest fixing it generally for all cloning devices (and handling O_??LOCK as well) would be a better method. kre
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: snj
Date: Thu Sep 29 14:38:24 UTC 2022
Modified Files:
src/sys/dev/pci [netbsd-8]: mpii.c
Log Message:
Apply patch (requested by bouyer in ticket #1767):
Convert from pci_intr_map() to pci_intr_alloc(); makes the driver use
MSI/MSI-x when available.
To generate a diff of this commit:
cvs rdiff -u -r1.8.10.6 -r1.8.10.7 src/sys/dev/pci/mpii.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/mpii.c
diff -u src/sys/dev/pci/mpii.c:1.8.10.6 src/sys/dev/pci/mpii.c:1.8.10.7
--- src/sys/dev/pci/mpii.c:1.8.10.6 Sun Aug 9 14:17:48 2020
+++ src/sys/dev/pci/mpii.c Thu Sep 29 14:38:24 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mpii.c,v 1.8.10.6 2020/08/09 14:17:48 martin Exp $ */
+/* $NetBSD: mpii.c,v 1.8.10.7 2022/09/29 14:38:24 snj Exp $ */
/* OpenBSD: mpii.c,v 1.115 2012/04/11 13:29:14 naddy Exp */
/*
* Copyright (c) 2010 Mike Belopuhov
@@ -20,7 +20,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.8.10.6 2020/08/09 14:17:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.8.10.7 2022/09/29 14:38:24 snj Exp $");
#include "bio.h"
@@ -168,6 +168,7 @@ struct mpii_softc {
pcitag_t sc_tag;
void *sc_ih;
+ pci_intr_handle_t *sc_pihp;
struct scsipi_adapter sc_adapt;
struct scsipi_channel sc_chan;
@@ -459,7 +460,6 @@ mpii_attach(device_t parent, device_t se
struct pci_attach_args *pa = aux;
pcireg_t memtype;
intr;
- pci_intr_handle_t ih;
struct mpii_ccb *ccb;
struct scsipi_adapter *adapt = >sc_adapt;
struct scsipi_channel *chan = >sc_chan;
@@ -506,13 +506,14 @@ mpii_attach(device_t parent, device_t se
MPII_INTR_MASK_DOORBELL);
/* hook up the interrupt */
- if (pci_intr_map(pa, ) != 0) {
+ if (pci_intr_alloc(pa, >sc_pihp, NULL, 0)) {
aprint_error_dev(self, "unable to map interrupt\n");
goto unmap;
}
- intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- pci_intr_setattr(pa->pa_pc, , PCI_INTR_MPSAFE, true);
- sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_BIO,
+ intrstr = pci_intr_string(pa->pa_pc, sc->sc_pihp[0],
+ intrbuf, sizeof(intrbuf));
+ pci_intr_setattr(pa->pa_pc, >sc_pihp[0], PCI_INTR_MPSAFE, true);
+ sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, sc->sc_pihp[0], IPL_BIO,
mpii_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: snj Date: Thu Sep 29 14:38:24 UTC 2022 Modified Files: src/sys/dev/pci [netbsd-8]: mpii.c Log Message: Apply patch (requested by bouyer in ticket #1767): Convert from pci_intr_map() to pci_intr_alloc(); makes the driver use MSI/MSI-x when available. To generate a diff of this commit: cvs rdiff -u -r1.8.10.6 -r1.8.10.7 src/sys/dev/pci/mpii.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/lib/libc/stdlib
Date:Thu, 29 Sep 2022 08:18:49 -0400
From:Christos Zoulas
Message-ID:
| Yes, I had forgotten about the need to do this explicitly...
| > On Sep 28, 2022, at 10:23 PM, Robert Elz wrote:
| >
| > Apologies, I did not read the code closely enough, there must be a bug
| > in the way the clone file descriptor is created.
I think I know the cause now, and it isn't anything specific to /dev/ptmx
it would affect all cloning devices.
In kern/vfs_syscalls.c do_open() we see the following:
if (vp == NULL) {
fd_abort(p, fp, indx);
error = fd_dupopen(dupfd, dupfd_move, flags, );
if (error)
return error;
*fd = indx;
} else {
error = open_setfp(l, fp, vp, indx, flags);
if (error)
return error;
VOP_UNLOCK(vp);
*fd = indx;
fd_affix(p, fp, indx);
}
The vp==NULL case is where cloning devices are handled. fd_dupopen()
arranges top make the duplicate happen.
It attempts to handle O_CLOEXEC thus:
error = fd_dup(fp, 0, newp, ff->ff_exclose);
where ff_exclose is the close_on_exec bit for the old file descriptor
(the one being duplicated) which is just fine for other calls of fd_dupopen().
The vp!=NULL case above is for "normal" opens, and open_setfp() is what
handles O_CLOEXEC - that's what (eventually) makes ff_exclose be true
(it also handles O_EXLOCK and O_SHLOCK.
None of that is being done in the cloning device open case, so those 3
flags simply cannot work, as the code is written currently, for these
devices.
I'm not about to go playing in this very fiddly piece of code, but I'm
kind of hoping that dholland@ might know the right magic sequence to make
this issue go away.
It probably means a call to open_setfp() with some parameters or other,
somewhere in the vp==NULL side of that if statement, though, just what
I have not attempted to work out.
kre
Re: CVS commit: src/lib/libc/stdlib
Yes, I had forgotten about the need to do this explicitly... christos > On Sep 28, 2022, at 10:23 PM, Robert Elz wrote: > > Apologies, I did not read the code closely enough, there must be a bug > in the way the clone file descriptor is created. > > kre signature.asc Description: Message signed with OpenPGP
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Thu Sep 29 12:18:27 UTC 2022 Modified Files: src/sys/kern: tty_ptm.c Log Message: Add fd_set_exclose(). It is probably better to do this automatically in fd_affix()... To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/kern/tty_ptm.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/kern/tty_ptm.c diff -u src/sys/kern/tty_ptm.c:1.44 src/sys/kern/tty_ptm.c:1.45 --- src/sys/kern/tty_ptm.c:1.44 Sat Sep 24 12:29:27 2022 +++ src/sys/kern/tty_ptm.c Thu Sep 29 08:18:27 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: tty_ptm.c,v 1.44 2022/09/24 16:29:27 christos Exp $ */ +/* $NetBSD: tty_ptm.c,v 1.45 2022/09/29 12:18:27 christos Exp $ */ /*- * Copyright (c) 2004, 2020 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v 1.44 2022/09/24 16:29:27 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v 1.45 2022/09/29 12:18:27 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -204,7 +204,9 @@ retry: fp->f_type = DTYPE_VNODE; fp->f_ops = fp->f_vnode = vp; + VOP_UNLOCK(vp); + fd_set_exclose(l, *fd, (flags & O_CLOEXEC) != 0); fd_affix(curproc, fp, *fd); return 0; bad:
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Thu Sep 29 12:18:27 UTC 2022 Modified Files: src/sys/kern: tty_ptm.c Log Message: Add fd_set_exclose(). It is probably better to do this automatically in fd_affix()... To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/kern/tty_ptm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: bouyer Date: Thu Sep 29 10:27:02 UTC 2022 Modified Files: src/sys/dev/pci: mfii.c Log Message: Convert from pci_intr_map() to pci_intr_alloc(); makes the driver use MSI/MSI-x when available. Tested by Edgar Fu�. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/mfii.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: bouyer
Date: Thu Sep 29 10:27:02 UTC 2022
Modified Files:
src/sys/dev/pci: mfii.c
Log Message:
Convert from pci_intr_map() to pci_intr_alloc(); makes the driver use
MSI/MSI-x when available. Tested by Edgar Fu�.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/mfii.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/mfii.c
diff -u src/sys/dev/pci/mfii.c:1.27 src/sys/dev/pci/mfii.c:1.28
--- src/sys/dev/pci/mfii.c:1.27 Wed Sep 14 01:05:42 2022
+++ src/sys/dev/pci/mfii.c Thu Sep 29 10:27:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mfii.c,v 1.27 2022/09/14 01:05:42 msaitoh Exp $ */
+/* $NetBSD: mfii.c,v 1.28 2022/09/29 10:27:02 bouyer Exp $ */
/* $OpenBSD: mfii.c,v 1.58 2018/08/14 05:22:21 jmatthew Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.27 2022/09/14 01:05:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.28 2022/09/29 10:27:02 bouyer Exp $");
#include "bio.h"
@@ -703,7 +703,7 @@ mfii_attach(device_t parent, device_t se
struct mfii_softc *sc = device_private(self);
struct pci_attach_args *pa = aux;
pcireg_t memtype;
- pci_intr_handle_t ih;
+ pci_intr_handle_t *ihp;
char intrbuf[PCI_INTRSTR_LEN];
const char *intrstr;
u_int32_t status, scpad2, scpad3;
@@ -754,12 +754,12 @@ mfii_attach(device_t parent, device_t se
/* disable interrupts */
mfii_write(sc, MFI_OMSK, 0x);
- if (pci_intr_map(pa, ) != 0) {
+ if (pci_intr_alloc(pa, , NULL, 0)) {
aprint_error(": unable to map interrupt\n");
goto pci_unmap;
}
- intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- pci_intr_setattr(pa->pa_pc, , PCI_INTR_MPSAFE, true);
+ intrstr = pci_intr_string(pa->pa_pc, ihp[0], intrbuf, sizeof(intrbuf));
+ pci_intr_setattr(pa->pa_pc, [0], PCI_INTR_MPSAFE, true);
/* lets get started */
if (mfii_transition_firmware(sc))
@@ -873,7 +873,7 @@ mfii_attach(device_t parent, device_t se
aprint_normal("\n");
aprint_naive("\n");
- sc->sc_ih = pci_intr_establish_xname(sc->sc_pc, ih, IPL_BIO,
+ sc->sc_ih = pci_intr_establish_xname(sc->sc_pc, ihp[0], IPL_BIO,
mfii_intr, sc, DEVNAME(sc));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "can't establish interrupt");
CVS commit: src/sys/arch
Module Name:src Committed By: riastradh Date: Thu Sep 29 10:10:10 UTC 2022 Modified Files: src/sys/arch/acorn32/conf: GENERIC src/sys/arch/alpha/conf: GENERIC src/sys/arch/amd64/conf: GENERIC src/sys/arch/amiga/conf: GENERIC src/sys/arch/amigappc/conf: GENERIC src/sys/arch/arc/conf: GENERIC src/sys/arch/bebox/conf: GENERIC src/sys/arch/cats/conf: GENERIC src/sys/arch/cesfic/conf: GENERIC src/sys/arch/cobalt/conf: GENERIC src/sys/arch/dreamcast/conf: GENERIC src/sys/arch/emips/conf: GENERIC src/sys/arch/epoc32/conf: GENERIC src/sys/arch/evbarm/conf: GENERIC.common src/sys/arch/evbmips/conf: OCTEON src/sys/arch/evbppc/conf: TWRP1025 src/sys/arch/ews4800mips/conf: GENERIC src/sys/arch/hp300/conf: GENERIC src/sys/arch/hpcmips/conf: GENERIC src/sys/arch/hpcsh/conf: GENERIC src/sys/arch/hppa/conf: GENERIC src/sys/arch/i386/conf: GENERIC src/sys/arch/ia64/conf: GENERIC src/sys/arch/ibmnws/conf: GENERIC src/sys/arch/iyonix/conf: GENERIC src/sys/arch/landisk/conf: GENERIC src/sys/arch/luna68k/conf: GENERIC src/sys/arch/mipsco/conf: GENERIC src/sys/arch/mmeye/conf: GENERIC src/sys/arch/mvme68k/conf: GENERIC src/sys/arch/mvmeppc/conf: GENERIC src/sys/arch/netwinder/conf: GENERIC src/sys/arch/news68k/conf: GENERIC src/sys/arch/newsmips/conf: GENERIC src/sys/arch/ofppc/conf: GENERIC src/sys/arch/playstation2/conf: config.playstation2 src/sys/arch/pmax/conf: GENERIC src/sys/arch/prep/conf: GENERIC src/sys/arch/riscv/conf: GENERIC src/sys/arch/rs6000/conf: GENERIC src/sys/arch/sandpoint/conf: GENERIC src/sys/arch/sbmips/conf: GENERIC src/sys/arch/shark/conf: GENERIC src/sys/arch/sparc/conf: GENERIC src/sys/arch/sparc64/conf: GENERIC src/sys/arch/sun3/conf: GENERIC src/sys/arch/vax/conf: GENERIC src/sys/arch/x68k/conf: GENERIC src/sys/arch/zaurus/conf: GENERIC Log Message: swwdog(4): Add to GENERIC kernels. Plus a handful of others that I'm familiar with. Lots of special- purpose kernels should probably have this too but I'm not going through all the arm, mips, and ppc evaluation board kernels to see which ones are relevant. Omitted from systems I know to be very small: - sun2/GENERIC - dreamcast/GENERIC Feel free to remove it from others that need to be kept smaller. Compile-tested a few of these just in case: - alpha/GENERIC - amd64/GENERIC - evbmips/OCTEON - i386/GENERIC - riscv/GENERIC PR kern/29702 To generate a diff of this commit: cvs rdiff -u -r1.135 -r1.136 src/sys/arch/acorn32/conf/GENERIC cvs rdiff -u -r1.415 -r1.416 src/sys/arch/alpha/conf/GENERIC cvs rdiff -u -r1.598 -r1.599 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.336 -r1.337 src/sys/arch/amiga/conf/GENERIC cvs rdiff -u -r1.43 -r1.44 src/sys/arch/amigappc/conf/GENERIC cvs rdiff -u -r1.201 -r1.202 src/sys/arch/arc/conf/GENERIC cvs rdiff -u -r1.167 -r1.168 src/sys/arch/bebox/conf/GENERIC cvs rdiff -u -r1.185 -r1.186 src/sys/arch/cats/conf/GENERIC cvs rdiff -u -r1.76 -r1.77 src/sys/arch/cesfic/conf/GENERIC cvs rdiff -u -r1.171 -r1.172 src/sys/arch/cobalt/conf/GENERIC cvs rdiff -u -r1.135 -r1.136 src/sys/arch/dreamcast/conf/GENERIC cvs rdiff -u -r1.25 -r1.26 src/sys/arch/emips/conf/GENERIC cvs rdiff -u -r1.16 -r1.17 src/sys/arch/epoc32/conf/GENERIC cvs rdiff -u -r1.49 -r1.50 src/sys/arch/evbarm/conf/GENERIC.common cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbmips/conf/OCTEON cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbppc/conf/TWRP1025 cvs rdiff -u -r1.65 -r1.66 src/sys/arch/ews4800mips/conf/GENERIC cvs rdiff -u -r1.209 -r1.210 src/sys/arch/hp300/conf/GENERIC cvs rdiff -u -r1.246 -r1.247 src/sys/arch/hpcmips/conf/GENERIC cvs rdiff -u -r1.115 -r1.116 src/sys/arch/hpcsh/conf/GENERIC cvs rdiff -u -r1.40 -r1.41 src/sys/arch/hppa/conf/GENERIC cvs rdiff -u -r1.1241 -r1.1242 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ia64/conf/GENERIC cvs rdiff -u -r1.55 -r1.56 src/sys/arch/ibmnws/conf/GENERIC cvs rdiff -u -r1.114 -r1.115 src/sys/arch/iyonix/conf/GENERIC cvs rdiff -u -r1.73 -r1.74 src/sys/arch/landisk/conf/GENERIC cvs rdiff -u -r1.134 -r1.135 src/sys/arch/luna68k/conf/GENERIC cvs rdiff -u -r1.98 -r1.99 src/sys/arch/mipsco/conf/GENERIC cvs rdiff -u -r1.130 -r1.131 src/sys/arch/mmeye/conf/GENERIC cvs rdiff -u -r1.104 -r1.105 src/sys/arch/mvme68k/conf/GENERIC cvs rdiff -u -r1.31 -r1.32 src/sys/arch/mvmeppc/conf/GENERIC cvs rdiff -u -r1.143 -r1.144 src/sys/arch/netwinder/conf/GENERIC cvs rdiff -u -r1.139 -r1.140 src/sys/arch/news68k/conf/GENERIC cvs rdiff -u -r1.141 -r1.142 src/sys/arch/newsmips/conf/GENERIC cvs rdiff -u -r1.177 -r1.178 src/sys/arch/ofppc/conf/GENERIC cvs rdiff -u -r1.27 -r1.28
CVS commit: src/sys/arch
Module Name:src Committed By: riastradh Date: Thu Sep 29 10:10:10 UTC 2022 Modified Files: src/sys/arch/acorn32/conf: GENERIC src/sys/arch/alpha/conf: GENERIC src/sys/arch/amd64/conf: GENERIC src/sys/arch/amiga/conf: GENERIC src/sys/arch/amigappc/conf: GENERIC src/sys/arch/arc/conf: GENERIC src/sys/arch/bebox/conf: GENERIC src/sys/arch/cats/conf: GENERIC src/sys/arch/cesfic/conf: GENERIC src/sys/arch/cobalt/conf: GENERIC src/sys/arch/dreamcast/conf: GENERIC src/sys/arch/emips/conf: GENERIC src/sys/arch/epoc32/conf: GENERIC src/sys/arch/evbarm/conf: GENERIC.common src/sys/arch/evbmips/conf: OCTEON src/sys/arch/evbppc/conf: TWRP1025 src/sys/arch/ews4800mips/conf: GENERIC src/sys/arch/hp300/conf: GENERIC src/sys/arch/hpcmips/conf: GENERIC src/sys/arch/hpcsh/conf: GENERIC src/sys/arch/hppa/conf: GENERIC src/sys/arch/i386/conf: GENERIC src/sys/arch/ia64/conf: GENERIC src/sys/arch/ibmnws/conf: GENERIC src/sys/arch/iyonix/conf: GENERIC src/sys/arch/landisk/conf: GENERIC src/sys/arch/luna68k/conf: GENERIC src/sys/arch/mipsco/conf: GENERIC src/sys/arch/mmeye/conf: GENERIC src/sys/arch/mvme68k/conf: GENERIC src/sys/arch/mvmeppc/conf: GENERIC src/sys/arch/netwinder/conf: GENERIC src/sys/arch/news68k/conf: GENERIC src/sys/arch/newsmips/conf: GENERIC src/sys/arch/ofppc/conf: GENERIC src/sys/arch/playstation2/conf: config.playstation2 src/sys/arch/pmax/conf: GENERIC src/sys/arch/prep/conf: GENERIC src/sys/arch/riscv/conf: GENERIC src/sys/arch/rs6000/conf: GENERIC src/sys/arch/sandpoint/conf: GENERIC src/sys/arch/sbmips/conf: GENERIC src/sys/arch/shark/conf: GENERIC src/sys/arch/sparc/conf: GENERIC src/sys/arch/sparc64/conf: GENERIC src/sys/arch/sun3/conf: GENERIC src/sys/arch/vax/conf: GENERIC src/sys/arch/x68k/conf: GENERIC src/sys/arch/zaurus/conf: GENERIC Log Message: swwdog(4): Add to GENERIC kernels. Plus a handful of others that I'm familiar with. Lots of special- purpose kernels should probably have this too but I'm not going through all the arm, mips, and ppc evaluation board kernels to see which ones are relevant. Omitted from systems I know to be very small: - sun2/GENERIC - dreamcast/GENERIC Feel free to remove it from others that need to be kept smaller. Compile-tested a few of these just in case: - alpha/GENERIC - amd64/GENERIC - evbmips/OCTEON - i386/GENERIC - riscv/GENERIC PR kern/29702 To generate a diff of this commit: cvs rdiff -u -r1.135 -r1.136 src/sys/arch/acorn32/conf/GENERIC cvs rdiff -u -r1.415 -r1.416 src/sys/arch/alpha/conf/GENERIC cvs rdiff -u -r1.598 -r1.599 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.336 -r1.337 src/sys/arch/amiga/conf/GENERIC cvs rdiff -u -r1.43 -r1.44 src/sys/arch/amigappc/conf/GENERIC cvs rdiff -u -r1.201 -r1.202 src/sys/arch/arc/conf/GENERIC cvs rdiff -u -r1.167 -r1.168 src/sys/arch/bebox/conf/GENERIC cvs rdiff -u -r1.185 -r1.186 src/sys/arch/cats/conf/GENERIC cvs rdiff -u -r1.76 -r1.77 src/sys/arch/cesfic/conf/GENERIC cvs rdiff -u -r1.171 -r1.172 src/sys/arch/cobalt/conf/GENERIC cvs rdiff -u -r1.135 -r1.136 src/sys/arch/dreamcast/conf/GENERIC cvs rdiff -u -r1.25 -r1.26 src/sys/arch/emips/conf/GENERIC cvs rdiff -u -r1.16 -r1.17 src/sys/arch/epoc32/conf/GENERIC cvs rdiff -u -r1.49 -r1.50 src/sys/arch/evbarm/conf/GENERIC.common cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbmips/conf/OCTEON cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbppc/conf/TWRP1025 cvs rdiff -u -r1.65 -r1.66 src/sys/arch/ews4800mips/conf/GENERIC cvs rdiff -u -r1.209 -r1.210 src/sys/arch/hp300/conf/GENERIC cvs rdiff -u -r1.246 -r1.247 src/sys/arch/hpcmips/conf/GENERIC cvs rdiff -u -r1.115 -r1.116 src/sys/arch/hpcsh/conf/GENERIC cvs rdiff -u -r1.40 -r1.41 src/sys/arch/hppa/conf/GENERIC cvs rdiff -u -r1.1241 -r1.1242 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ia64/conf/GENERIC cvs rdiff -u -r1.55 -r1.56 src/sys/arch/ibmnws/conf/GENERIC cvs rdiff -u -r1.114 -r1.115 src/sys/arch/iyonix/conf/GENERIC cvs rdiff -u -r1.73 -r1.74 src/sys/arch/landisk/conf/GENERIC cvs rdiff -u -r1.134 -r1.135 src/sys/arch/luna68k/conf/GENERIC cvs rdiff -u -r1.98 -r1.99 src/sys/arch/mipsco/conf/GENERIC cvs rdiff -u -r1.130 -r1.131 src/sys/arch/mmeye/conf/GENERIC cvs rdiff -u -r1.104 -r1.105 src/sys/arch/mvme68k/conf/GENERIC cvs rdiff -u -r1.31 -r1.32 src/sys/arch/mvmeppc/conf/GENERIC cvs rdiff -u -r1.143 -r1.144 src/sys/arch/netwinder/conf/GENERIC cvs rdiff -u -r1.139 -r1.140 src/sys/arch/news68k/conf/GENERIC cvs rdiff -u -r1.141 -r1.142 src/sys/arch/newsmips/conf/GENERIC cvs rdiff -u -r1.177 -r1.178 src/sys/arch/ofppc/conf/GENERIC cvs rdiff -u -r1.27 -r1.28
CVS commit: src/tests/usr.bin/c++
Module Name:src
Committed By: skrll
Date: Thu Sep 29 07:22:49 UTC 2022
Modified Files:
src/tests/usr.bin/c++: t_call_once2.sh
Log Message:
toolchain/57033: usr.bin/c++/t_call_once2:call_once2_profile test case fails
Remove the -static flag I added because it doesn't fix anything and it
actually causes more problems.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/usr.bin/c++/t_call_once2.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/c++/t_call_once2.sh
diff -u src/tests/usr.bin/c++/t_call_once2.sh:1.7 src/tests/usr.bin/c++/t_call_once2.sh:1.8
--- src/tests/usr.bin/c++/t_call_once2.sh:1.7 Wed Sep 28 11:09:59 2022
+++ src/tests/usr.bin/c++/t_call_once2.sh Thu Sep 29 07:22:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: t_call_once2.sh,v 1.7 2022/09/28 11:09:59 skrll Exp $
+# $NetBSD: t_call_once2.sh,v 1.8 2022/09/29 07:22:49 skrll Exp $
#
# Copyright (c) 2018 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -154,7 +154,7 @@ int main(void) {
return 0;
}
EOF
- atf_check -s exit:0 -o ignore -e ignore c++ -static -pg -o call_once2 test.cpp -pthread
+ atf_check -s exit:0 -o ignore -e ignore c++ -pg -o call_once2 test.cpp -pthread
atf_check -s exit:0 -o inline:"hello, world!\n" ./call_once2
}
@@ -198,7 +198,7 @@ int main(void) {
return 0;
}
EOF
- atf_check -s exit:0 -o ignore -e ignore c++ -static -m32 -pg -o call_once2 test.cpp -pthread
+ atf_check -s exit:0 -o ignore -e ignore c++ -m32 -pg -o call_once2 test.cpp -pthread
atf_check -s exit:0 -o inline:"hello, world!\n" ./call_once2
atf_expect_fail "The combination of 32-bit and profiling should be fail"
}
CVS commit: src/tests/usr.bin/c++
Module Name:src Committed By: skrll Date: Thu Sep 29 07:22:49 UTC 2022 Modified Files: src/tests/usr.bin/c++: t_call_once2.sh Log Message: toolchain/57033: usr.bin/c++/t_call_once2:call_once2_profile test case fails Remove the -static flag I added because it doesn't fix anything and it actually causes more problems. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tests/usr.bin/c++/t_call_once2.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips
Module Name:src Committed By: skrll Date: Thu Sep 29 07:00:47 UTC 2022 Modified Files: src/sys/arch/mips/adm5120/dev: admpci.c if_admsw.c if_admswvar.h wdc_extio.c src/sys/arch/mips/alchemy: aubus.c src/sys/arch/mips/alchemy/dev: aupci.c if_aumac.c src/sys/arch/mips/atheros/dev: if_ae.c if_ath_arbus.c src/sys/arch/mips/cavium/dev: if_cnmac.c octeon_ciu.c octeon_smi.c octeon_xhci.c src/sys/arch/mips/mips: bus_space_alignstride_chipdep.c core_machdep.c cpu_exec.c vm_machdep.c src/sys/arch/mips/ralink: ralink_bus.c ralink_eth.c ralink_i2c.c src/sys/arch/mips/rmi: rmixl_cpu.c rmixl_cpunode.c rmixl_intr.c rmixl_mainbus.c rmixl_obio.c Log Message: Remove unnecessary include of . To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/mips/adm5120/dev/admpci.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/mips/adm5120/dev/if_admsw.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/adm5120/dev/if_admswvar.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mips/adm5120/dev/wdc_extio.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/mips/alchemy/aubus.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/mips/alchemy/dev/aupci.c cvs rdiff -u -r1.51 -r1.52 src/sys/arch/mips/alchemy/dev/if_aumac.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/mips/atheros/dev/if_ae.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/mips/atheros/dev/if_ath_arbus.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/mips/cavium/dev/if_cnmac.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/cavium/dev/octeon_ciu.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/cavium/dev/octeon_smi.c \ src/sys/arch/mips/cavium/dev/octeon_xhci.c cvs rdiff -u -r1.31 -r1.32 \ src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/mips/core_machdep.c cvs rdiff -u -r1.69 -r1.70 src/sys/arch/mips/mips/cpu_exec.c cvs rdiff -u -r1.164 -r1.165 src/sys/arch/mips/mips/vm_machdep.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/ralink/ralink_bus.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/mips/ralink/ralink_eth.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/ralink/ralink_i2c.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mips/rmi/rmixl_cpu.c \ src/sys/arch/mips/rmi/rmixl_intr.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/rmi/rmixl_cpunode.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/rmi/rmixl_mainbus.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/rmi/rmixl_obio.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/arch/mips/adm5120/dev/admpci.c diff -u src/sys/arch/mips/adm5120/dev/admpci.c:1.17 src/sys/arch/mips/adm5120/dev/admpci.c:1.18 --- src/sys/arch/mips/adm5120/dev/admpci.c:1.17 Thu Sep 29 06:58:37 2022 +++ src/sys/arch/mips/adm5120/dev/admpci.c Thu Sep 29 07:00:46 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: admpci.c,v 1.17 2022/09/29 06:58:37 skrll Exp $ */ +/* $NetBSD: admpci.c,v 1.18 2022/09/29 07:00:46 skrll Exp $ */ /*- * Copyright (c) 2007 David Young. All rights reserved. @@ -61,7 +61,7 @@ #include "pci.h" #include -__KERNEL_RCSID(0, "$NetBSD: admpci.c,v 1.17 2022/09/29 06:58:37 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: admpci.c,v 1.18 2022/09/29 07:00:46 skrll Exp $"); #include #include @@ -71,7 +71,6 @@ __KERNEL_RCSID(0, "$NetBSD: admpci.c,v 1 #include #include #include -#include #include #include Index: src/sys/arch/mips/adm5120/dev/if_admsw.c diff -u src/sys/arch/mips/adm5120/dev/if_admsw.c:1.29 src/sys/arch/mips/adm5120/dev/if_admsw.c:1.30 --- src/sys/arch/mips/adm5120/dev/if_admsw.c:1.29 Sun Sep 18 11:17:36 2022 +++ src/sys/arch/mips/adm5120/dev/if_admsw.c Thu Sep 29 07:00:46 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: if_admsw.c,v 1.29 2022/09/18 11:17:36 thorpej Exp $ */ +/* $NetBSD: if_admsw.c,v 1.30 2022/09/29 07:00:46 skrll Exp $ */ /*- * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko. @@ -76,7 +76,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.29 2022/09/18 11:17:36 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.30 2022/09/29 07:00:46 skrll Exp $"); #include @@ -88,7 +88,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v #include #include #include -#include #include #include #include Index: src/sys/arch/mips/adm5120/dev/if_admswvar.h diff -u src/sys/arch/mips/adm5120/dev/if_admswvar.h:1.8 src/sys/arch/mips/adm5120/dev/if_admswvar.h:1.9 --- src/sys/arch/mips/adm5120/dev/if_admswvar.h:1.8 Thu Apr 16 23:29:52 2020 +++ src/sys/arch/mips/adm5120/dev/if_admswvar.h Thu Sep 29 07:00:46 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: if_admswvar.h,v 1.8 2020/04/16 23:29:52 rin Exp $ */ +/* $NetBSD: if_admswvar.h,v 1.9 2022/09/29 07:00:46 skrll Exp $ */ /*- * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko. @@ -34,7 +34,7 @@ #define _IF_ADMSWVAR_H_ #include -__KERNEL_RCSID(0, "$NetBSD: if_admswvar.h,v 1.8 2020/04/16 23:29:52 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD:
CVS commit: src/sys/arch/mips
Module Name:src Committed By: skrll Date: Thu Sep 29 07:00:47 UTC 2022 Modified Files: src/sys/arch/mips/adm5120/dev: admpci.c if_admsw.c if_admswvar.h wdc_extio.c src/sys/arch/mips/alchemy: aubus.c src/sys/arch/mips/alchemy/dev: aupci.c if_aumac.c src/sys/arch/mips/atheros/dev: if_ae.c if_ath_arbus.c src/sys/arch/mips/cavium/dev: if_cnmac.c octeon_ciu.c octeon_smi.c octeon_xhci.c src/sys/arch/mips/mips: bus_space_alignstride_chipdep.c core_machdep.c cpu_exec.c vm_machdep.c src/sys/arch/mips/ralink: ralink_bus.c ralink_eth.c ralink_i2c.c src/sys/arch/mips/rmi: rmixl_cpu.c rmixl_cpunode.c rmixl_intr.c rmixl_mainbus.c rmixl_obio.c Log Message: Remove unnecessary include of . To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/mips/adm5120/dev/admpci.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/mips/adm5120/dev/if_admsw.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/adm5120/dev/if_admswvar.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mips/adm5120/dev/wdc_extio.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/mips/alchemy/aubus.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/mips/alchemy/dev/aupci.c cvs rdiff -u -r1.51 -r1.52 src/sys/arch/mips/alchemy/dev/if_aumac.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/mips/atheros/dev/if_ae.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/mips/atheros/dev/if_ath_arbus.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/mips/cavium/dev/if_cnmac.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/cavium/dev/octeon_ciu.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/cavium/dev/octeon_smi.c \ src/sys/arch/mips/cavium/dev/octeon_xhci.c cvs rdiff -u -r1.31 -r1.32 \ src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/mips/core_machdep.c cvs rdiff -u -r1.69 -r1.70 src/sys/arch/mips/mips/cpu_exec.c cvs rdiff -u -r1.164 -r1.165 src/sys/arch/mips/mips/vm_machdep.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/ralink/ralink_bus.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/mips/ralink/ralink_eth.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/ralink/ralink_i2c.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mips/rmi/rmixl_cpu.c \ src/sys/arch/mips/rmi/rmixl_intr.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/rmi/rmixl_cpunode.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/rmi/rmixl_mainbus.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/rmi/rmixl_obio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/rmi
Module Name:src
Committed By: skrll
Date: Thu Sep 29 06:59:44 UTC 2022
Modified Files:
src/sys/arch/mips/rmi: rmixl_cpu.c rmixl_intr.c rmixl_mainbus.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mips/rmi/rmixl_cpu.c \
src/sys/arch/mips/rmi/rmixl_intr.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/rmi/rmixl_mainbus.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/arch/mips/rmi/rmixl_cpu.c
diff -u src/sys/arch/mips/rmi/rmixl_cpu.c:1.13 src/sys/arch/mips/rmi/rmixl_cpu.c:1.14
--- src/sys/arch/mips/rmi/rmixl_cpu.c:1.13 Sat Apr 9 14:09:32 2022
+++ src/sys/arch/mips/rmi/rmixl_cpu.c Thu Sep 29 06:59:44 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_cpu.c,v 1.13 2022/04/09 14:09:32 riastradh Exp $ */
+/* $NetBSD: rmixl_cpu.c,v 1.14 2022/09/29 06:59:44 skrll Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -38,7 +38,7 @@
#include "locators.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: rmixl_cpu.c,v 1.13 2022/04/09 14:09:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_cpu.c,v 1.14 2022/09/29 06:59:44 skrll Exp $");
#include "opt_multiprocessor.h"
#include "opt_ddb.h"
@@ -88,7 +88,7 @@ struct cpu_info *
#endif /* DEBUG */
CFATTACH_DECL_NEW(cpu_rmixl, sizeof(struct rmixl_cpu_softc),
- cpu_rmixl_match, cpu_rmixl_attach, NULL, NULL);
+ cpu_rmixl_match, cpu_rmixl_attach, NULL, NULL);
#ifdef MULTIPROCESSOR
static struct rmixl_cpu_trampoline_args rmixl_cpu_trampoline_args;
@@ -118,7 +118,7 @@ cpu_rmixl_watchpoint_init(void)
* cpu_xls616_erratum
*
* on the XLS616, COUNT/COMPARE clock regs seem to interact between
- * threads on a core
+ * threads on a core
*
* the symptom of the error is retarded clock interrupts
* and very slow apparent system performance
@@ -174,7 +174,7 @@ cpu_rmixl_attach(device_t parent, device
struct cpu_info *ci = NULL;
static bool once = false;
extern void rmixl_spl_init_cpu(void);
-
+
if (once == false) {
/* first attach is the primary cpu */
once = true;
@@ -336,7 +336,7 @@ cpu_setup_trampoline_common(struct cpu_i
{
struct lwp *l = ci->ci_data.cpu_idlelwp;
uintptr_t stacktop;
-
+
#ifdef DIAGNOSTIC
/* Ensure our current stack can be used by the firmware */
uint64_t sp;
@@ -392,7 +392,7 @@ cpu_setup_trampoline_callback(struct cpu
struct rmixl_cpu_trampoline_args *ta = _cpu_trampoline_args;
extern void rmixl_cpu_trampoline(void *);
extern void rmixlfw_wakeup_cpu(void *, void *, u_int64_t, void *);
-
+
cpu_setup_trampoline_common(ci, ta);
#if _LP64
Index: src/sys/arch/mips/rmi/rmixl_intr.c
diff -u src/sys/arch/mips/rmi/rmixl_intr.c:1.13 src/sys/arch/mips/rmi/rmixl_intr.c:1.14
--- src/sys/arch/mips/rmi/rmixl_intr.c:1.13 Sat Apr 9 23:34:50 2022
+++ src/sys/arch/mips/rmi/rmixl_intr.c Thu Sep 29 06:59:44 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_intr.c,v 1.13 2022/04/09 23:34:50 riastradh Exp $ */
+/* $NetBSD: rmixl_intr.c,v 1.14 2022/09/29 06:59:44 skrll Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rmixl_intr.c,v 1.13 2022/04/09 23:34:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_intr.c,v 1.14 2022/09/29 06:59:44 skrll Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -391,7 +391,7 @@ dclz(uint64_t val)
asm volatile("dclz %0, %1;"
: "=r"(nlz) : "r"(val));
-
+
return nlz;
}
@@ -590,7 +590,7 @@ rmixl_irt_thread_mask(int cpumask)
* discount cpus not present
*/
cpumask &= cpu_present_mask;
-
+
switch (MIPS_PRID_IMPL(mips_options.mips_cpu_id)) {
case MIPS_XLS104:
case MIPS_XLS204:
Index: src/sys/arch/mips/rmi/rmixl_mainbus.c
diff -u src/sys/arch/mips/rmi/rmixl_mainbus.c:1.6 src/sys/arch/mips/rmi/rmixl_mainbus.c:1.7
--- src/sys/arch/mips/rmi/rmixl_mainbus.c:1.6 Sat Aug 7 16:18:59 2021
+++ src/sys/arch/mips/rmi/rmixl_mainbus.c Thu Sep 29 06:59:44 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_mainbus.c,v 1.6 2021/08/07 16:18:59 thorpej Exp $ */
+/* $NetBSD: rmixl_mainbus.c,v 1.7 2022/09/29 06:59:44 skrll Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rmixl_mainbus.c,v 1.6 2021/08/07 16:18:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_mainbus.c,v 1.7 2022/09/29 06:59:44 skrll Exp $");
#include
#include
@@ -89,7 +89,7 @@ mainbusattach(device_t parent, device_t
mainbus_found = 1;
/*
- * attach mainbus devices
+ * attach mainbus devices
*/
config_search(self, NULL,
CFARGS(.search = mainbus_search));
@@ -121,12 +121,12 @@ mainbus_node_alloc(struct mainbus_softc
return node;
}
}
- panic("%s: node mask underflow", __func__);
+ panic("%s: node mask underflow", __func__);
} else {
- if (node >= 64)
- panic("%s: node >= 64", __func__);
+ if (node >= 64)
+ panic("%s: node >=
CVS commit: src/sys/arch/mips/rmi
Module Name:src Committed By: skrll Date: Thu Sep 29 06:59:44 UTC 2022 Modified Files: src/sys/arch/mips/rmi: rmixl_cpu.c rmixl_intr.c rmixl_mainbus.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mips/rmi/rmixl_cpu.c \ src/sys/arch/mips/rmi/rmixl_intr.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/rmi/rmixl_mainbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/ralink
Module Name:src Committed By: skrll Date: Thu Sep 29 06:59:33 UTC 2022 Modified Files: src/sys/arch/mips/ralink: ralink_i2c.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/ralink/ralink_i2c.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/ralink
Module Name:src
Committed By: skrll
Date: Thu Sep 29 06:59:33 UTC 2022
Modified Files:
src/sys/arch/mips/ralink: ralink_i2c.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/ralink/ralink_i2c.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/arch/mips/ralink/ralink_i2c.c
diff -u src/sys/arch/mips/ralink/ralink_i2c.c:1.6 src/sys/arch/mips/ralink/ralink_i2c.c:1.7
--- src/sys/arch/mips/ralink/ralink_i2c.c:1.6 Sat Aug 7 16:18:59 2021
+++ src/sys/arch/mips/ralink/ralink_i2c.c Thu Sep 29 06:59:33 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ralink_i2c.c,v 1.6 2021/08/07 16:18:59 thorpej Exp $ */
+/* $NetBSD: ralink_i2c.c,v 1.7 2022/09/29 06:59:33 skrll Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
/* ra_i2c.c - Ralink i2c 3052 driver */
#include
-__KERNEL_RCSID(0, "$NetBSD: ralink_i2c.c,v 1.6 2021/08/07 16:18:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_i2c.c,v 1.7 2022/09/29 06:59:33 skrll Exp $");
#include
#include
@@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: ralink_i2c.c
#endif
/*
- * Slow the I2C bus clock to 12.5 KHz to work around the misbehavior
+ * Slow the I2C bus clock to 12.5 KHz to work around the misbehavior
* of the TI part.
*/
#define CLKDIV_VALUE 4264
@@ -237,7 +237,7 @@ i2c_write(ra_i2c_softc_t *sc, u_long add
for (i=0; i < nbytes; i++) {
for (j=0; j < max_ee_busy_loop; j++) {
- r = bus_space_read_4(sc->sc_memt, sc->sc_i2c_memh,
+ r = bus_space_read_4(sc->sc_memt, sc->sc_i2c_memh,
RA_I2C_STATUS);
if ((r & I2C_STATUS_SDOEMPTY) != 0) {
bus_space_write_4(sc->sc_memt, sc->sc_i2c_memh,
@@ -256,7 +256,7 @@ i2c_write(ra_i2c_softc_t *sc, u_long add
aprint_error_dev(sc->sc_dev, "timeout error in %s\n",
__func__);
return EAGAIN;
- }
+ }
}
ra_i2c_busy_wait(sc);
@@ -280,7 +280,7 @@ i2c_read(ra_i2c_softc_t *sc, u_long addr
uint32_t r;
for (j=0; j < max_ee_busy_loop; j++) {
- r = bus_space_read_4(sc->sc_memt, sc->sc_i2c_memh,
+ r = bus_space_read_4(sc->sc_memt, sc->sc_i2c_memh,
RA_I2C_STATUS);
if ((r & I2C_STATUS_DATARDY) != 0) {
data[i] = bus_space_read_4(
@@ -331,7 +331,7 @@ ra_i2c_reset(ra_i2c_softc_t *sc)
/* reset i2c block */
r = bus_space_read_4(sc->sc_memt, sc->sc_sy_memh, RA_SYSCTL_RST);
- bus_space_write_4(sc->sc_memt, sc->sc_sy_memh, RA_SYSCTL_RST,
+ bus_space_write_4(sc->sc_memt, sc->sc_sy_memh, RA_SYSCTL_RST,
r | RST_I2C);
bus_space_write_4(sc->sc_memt, sc->sc_sy_memh, RA_SYSCTL_RST, r);
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: skrll Date: Thu Sep 29 06:59:12 UTC 2022 Modified Files: src/sys/arch/mips/mips: cpu_exec.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/arch/mips/mips/cpu_exec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: skrll Date: Thu Sep 29 06:59:12 UTC 2022 Modified Files: src/sys/arch/mips/mips: cpu_exec.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/arch/mips/mips/cpu_exec.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/arch/mips/mips/cpu_exec.c diff -u src/sys/arch/mips/mips/cpu_exec.c:1.68 src/sys/arch/mips/mips/cpu_exec.c:1.69 --- src/sys/arch/mips/mips/cpu_exec.c:1.68 Sun May 23 23:24:45 2021 +++ src/sys/arch/mips/mips/cpu_exec.c Thu Sep 29 06:59:12 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_exec.c,v 1.68 2021/05/23 23:24:45 mrg Exp $ */ +/* $NetBSD: cpu_exec.c,v 1.69 2022/09/29 06:59:12 skrll Exp $ */ /* * Copyright (c) 1992, 1993 @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v 1.68 2021/05/23 23:24:45 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v 1.69 2022/09/29 06:59:12 skrll Exp $"); #include "opt_compat_netbsd.h" #include "opt_compat_ultrix.h" @@ -201,7 +201,7 @@ coredump_elf32_setup(struct lwp *l, void eh->e_flags |= EF_MIPS_ABI2; break; case _MIPS_BSD_API_O32: - eh->e_flags |= EF_MIPS_ABI_O32; + eh->e_flags |= EF_MIPS_ABI_O32; break; } }
CVS commit: src/sys/arch/mips/cavium/dev
Module Name:src Committed By: skrll Date: Thu Sep 29 06:59:02 UTC 2022 Modified Files: src/sys/arch/mips/cavium/dev: if_cnmac.c octeon_smi.c octeon_xhci.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/mips/cavium/dev/if_cnmac.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/cavium/dev/octeon_smi.c \ src/sys/arch/mips/cavium/dev/octeon_xhci.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/arch/mips/cavium/dev/if_cnmac.c diff -u src/sys/arch/mips/cavium/dev/if_cnmac.c:1.27 src/sys/arch/mips/cavium/dev/if_cnmac.c:1.28 --- src/sys/arch/mips/cavium/dev/if_cnmac.c:1.27 Sun Sep 18 11:38:48 2022 +++ src/sys/arch/mips/cavium/dev/if_cnmac.c Thu Sep 29 06:59:01 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: if_cnmac.c,v 1.27 2022/09/18 11:38:48 thorpej Exp $ */ +/* $NetBSD: if_cnmac.c,v 1.28 2022/09/29 06:59:01 skrll Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_cnmac.c,v 1.27 2022/09/18 11:38:48 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cnmac.c,v 1.28 2022/09/29 06:59:01 skrll Exp $"); /* * If no free send buffer is available, free all the sent buffers and bail out. @@ -318,7 +318,7 @@ cnmac_attach(device_t parent, device_t s IFQ_SET_MAXLEN(>if_snd, uimax(GATHER_QUEUE_SIZE, IFQ_MAXLEN)); IFQ_SET_READY(>if_snd); - + ifp->if_capabilities = #if 0 /* XXX: no tx checksum yet */ IFCAP_CSUM_IPv4_Tx | IFCAP_CSUM_IPv4_Rx | Index: src/sys/arch/mips/cavium/dev/octeon_smi.c diff -u src/sys/arch/mips/cavium/dev/octeon_smi.c:1.7 src/sys/arch/mips/cavium/dev/octeon_smi.c:1.8 --- src/sys/arch/mips/cavium/dev/octeon_smi.c:1.7 Wed Jan 27 03:10:21 2021 +++ src/sys/arch/mips/cavium/dev/octeon_smi.c Thu Sep 29 06:59:01 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: octeon_smi.c,v 1.7 2021/01/27 03:10:21 thorpej Exp $ */ +/* $NetBSD: octeon_smi.c,v 1.8 2022/09/29 06:59:01 skrll Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: octeon_smi.c,v 1.7 2021/01/27 03:10:21 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: octeon_smi.c,v 1.8 2022/09/29 06:59:01 skrll Exp $"); #include #include @@ -198,7 +198,7 @@ octsmi_read(struct octsmi_softc *sc, int uint64_t smi_rd; int timo; - _SMI_WR8(sc, SMI_CMD_OFFSET, + _SMI_WR8(sc, SMI_CMD_OFFSET, __SHIFTIN(SMI_CMD_PHY_OP_READ, SMI_CMD_PHY_OP) | __SHIFTIN(phy_addr, SMI_CMD_PHY_ADR) | __SHIFTIN(reg, SMI_CMD_REG_ADR)); Index: src/sys/arch/mips/cavium/dev/octeon_xhci.c diff -u src/sys/arch/mips/cavium/dev/octeon_xhci.c:1.7 src/sys/arch/mips/cavium/dev/octeon_xhci.c:1.8 --- src/sys/arch/mips/cavium/dev/octeon_xhci.c:1.7 Wed Nov 10 17:19:29 2021 +++ src/sys/arch/mips/cavium/dev/octeon_xhci.c Thu Sep 29 06:59:01 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: octeon_xhci.c,v 1.7 2021/11/10 17:19:29 msaitoh Exp $ */ +/* $NetBSD: octeon_xhci.c,v 1.8 2022/09/29 06:59:01 skrll Exp $ */ /* $OpenBSD: octxhci.c,v 1.4 2019/09/29 04:32:23 visa Exp $ */ /* @@ -380,7 +380,7 @@ octxhci_dwc3_init(struct xhci_softc *sc) } /* bus_space(9) */ -#define CHIP octxhci +#define CHIP octxhci #define CHIP_IO #define CHIP_LITTLE_ENDIAN
CVS commit: src/sys/arch/mips/cavium/dev
Module Name:src Committed By: skrll Date: Thu Sep 29 06:59:02 UTC 2022 Modified Files: src/sys/arch/mips/cavium/dev: if_cnmac.c octeon_smi.c octeon_xhci.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/mips/cavium/dev/if_cnmac.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/cavium/dev/octeon_smi.c \ src/sys/arch/mips/cavium/dev/octeon_xhci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/alchemy
Module Name:src Committed By: skrll Date: Thu Sep 29 06:58:51 UTC 2022 Modified Files: src/sys/arch/mips/alchemy: aubus.c src/sys/arch/mips/alchemy/dev: aupci.c if_aumac.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/mips/alchemy/aubus.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/mips/alchemy/dev/aupci.c cvs rdiff -u -r1.50 -r1.51 src/sys/arch/mips/alchemy/dev/if_aumac.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/arch/mips/alchemy/aubus.c diff -u src/sys/arch/mips/alchemy/aubus.c:1.25 src/sys/arch/mips/alchemy/aubus.c:1.26 --- src/sys/arch/mips/alchemy/aubus.c:1.25 Sat Aug 7 16:18:58 2021 +++ src/sys/arch/mips/alchemy/aubus.c Thu Sep 29 06:58:51 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: aubus.c,v 1.25 2021/08/07 16:18:58 thorpej Exp $ */ +/* $NetBSD: aubus.c,v 1.26 2022/09/29 06:58:51 skrll Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -29,7 +29,7 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - */ + */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -97,7 +97,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: aubus.c,v 1.25 2021/08/07 16:18:58 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aubus.c,v 1.26 2022/09/29 06:58:51 skrll Exp $"); #include "locators.h" #define _MIPS_BUS_DMA_PRIVATE Index: src/sys/arch/mips/alchemy/dev/aupci.c diff -u src/sys/arch/mips/alchemy/dev/aupci.c:1.20 src/sys/arch/mips/alchemy/dev/aupci.c:1.21 --- src/sys/arch/mips/alchemy/dev/aupci.c:1.20 Sat Aug 7 16:18:58 2021 +++ src/sys/arch/mips/alchemy/dev/aupci.c Thu Sep 29 06:58:51 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: aupci.c,v 1.20 2021/08/07 16:18:58 thorpej Exp $ */ +/* $NetBSD: aupci.c,v 1.21 2022/09/29 06:58:51 skrll Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -29,13 +29,13 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - */ + */ #include "opt_pci.h" #include "pci.h" #include -__KERNEL_RCSID(0, "$NetBSD: aupci.c,v 1.20 2021/08/07 16:18:58 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aupci.c,v 1.21 2022/09/29 06:58:51 skrll Exp $"); #include #include @@ -156,7 +156,7 @@ aupciattach(device_t parent, device_t se bus_addr_t mstart; struct pcibus_attach_args pba; #endif - + aupci_found = 1; sc->sc_dev = self; @@ -194,7 +194,7 @@ aupciattach(device_t parent, device_t se * their drivers.) */ cfg = AUPCI_CONFIG_CH | AUPCI_CONFIG_R1H | - AUPCI_CONFIG_R2H | AUPCI_CONFIG_AEN | + AUPCI_CONFIG_R2H | AUPCI_CONFIG_AEN | AUPCI_CONFIG_SM | AUPCI_CONFIG_ST | AUPCI_CONFIG_SIC_DATA; #else cfg = AUPCI_CONFIG_CH | AUPCI_CONFIG_R1H | @@ -373,7 +373,7 @@ aupci_conf_access(void *v, int dir, pcit splx(s); bus_space_unmap(sc->sc_cfgt, h, 256); - + /* if we got a PCI master abort, fail it */ if (status & AUPCI_CONFIG_EF) return false; Index: src/sys/arch/mips/alchemy/dev/if_aumac.c diff -u src/sys/arch/mips/alchemy/dev/if_aumac.c:1.50 src/sys/arch/mips/alchemy/dev/if_aumac.c:1.51 --- src/sys/arch/mips/alchemy/dev/if_aumac.c:1.50 Sun Sep 18 11:25:33 2022 +++ src/sys/arch/mips/alchemy/dev/if_aumac.c Thu Sep 29 06:58:51 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: if_aumac.c,v 1.50 2022/09/18 11:25:33 thorpej Exp $ */ +/* $NetBSD: if_aumac.c,v 1.51 2022/09/29 06:58:51 skrll Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -46,7 +46,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.50 2022/09/18 11:25:33 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.51 2022/09/29 06:58:51 skrll Exp $"); @@ -635,7 +635,7 @@ aumac_rxintr(struct aumac_softc *sc) * Missed frames are a semi-frequent occurrence with this hardware, * and reporting of them just makes everything run slower and fills * the system log. Be silent. - * + * * Additionally, this missed bit indicates an error with the previous * packet, and not with this one! So PRINTERR is definitely wrong * here.
CVS commit: src/sys/arch/mips/alchemy
Module Name:src Committed By: skrll Date: Thu Sep 29 06:58:51 UTC 2022 Modified Files: src/sys/arch/mips/alchemy: aubus.c src/sys/arch/mips/alchemy/dev: aupci.c if_aumac.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/mips/alchemy/aubus.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/mips/alchemy/dev/aupci.c cvs rdiff -u -r1.50 -r1.51 src/sys/arch/mips/alchemy/dev/if_aumac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/adm5120/dev
Module Name:src Committed By: skrll Date: Thu Sep 29 06:58:37 UTC 2022 Modified Files: src/sys/arch/mips/adm5120/dev: admpci.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/mips/adm5120/dev/admpci.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/arch/mips/adm5120/dev/admpci.c diff -u src/sys/arch/mips/adm5120/dev/admpci.c:1.16 src/sys/arch/mips/adm5120/dev/admpci.c:1.17 --- src/sys/arch/mips/adm5120/dev/admpci.c:1.16 Sat Aug 7 16:18:58 2021 +++ src/sys/arch/mips/adm5120/dev/admpci.c Thu Sep 29 06:58:37 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: admpci.c,v 1.16 2021/08/07 16:18:58 thorpej Exp $ */ +/* $NetBSD: admpci.c,v 1.17 2022/09/29 06:58:37 skrll Exp $ */ /*- * Copyright (c) 2007 David Young. All rights reserved. @@ -55,13 +55,13 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - */ + */ #include "opt_pci.h" #include "pci.h" #include -__KERNEL_RCSID(0, "$NetBSD: admpci.c,v 1.16 2021/08/07 16:18:58 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: admpci.c,v 1.17 2022/09/29 06:58:37 skrll Exp $"); #include #include @@ -183,7 +183,7 @@ admpciattach(device_t parent, device_t s #if NPCI > 0 struct pcibus_attach_args pba; #endif - + admpci_found = 1; sc->sc_dev = self; @@ -418,7 +418,7 @@ admpci_conf_interrupt(void *v, int bus, /* * Map the bus 0 device numbers 1, 2, and 3 to IRQ 6, 7, and 8, * respectively. - * + * * XXX How to handle bridges? */ static int
CVS commit: src/sys/arch/mips/adm5120/dev
Module Name:src Committed By: skrll Date: Thu Sep 29 06:58:37 UTC 2022 Modified Files: src/sys/arch/mips/adm5120/dev: admpci.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/mips/adm5120/dev/admpci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/riscv/riscv
Module Name:src Committed By: skrll Date: Thu Sep 29 06:51:17 UTC 2022 Modified Files: src/sys/arch/riscv/riscv: exec_machdep.c vm_machdep.c Log Message: Remove unnecessary include of . To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/riscv/exec_machdep.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/riscv/riscv/vm_machdep.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/arch/riscv/riscv/exec_machdep.c diff -u src/sys/arch/riscv/riscv/exec_machdep.c:1.2 src/sys/arch/riscv/riscv/exec_machdep.c:1.3 --- src/sys/arch/riscv/riscv/exec_machdep.c:1.2 Wed Nov 4 07:09:46 2020 +++ src/sys/arch/riscv/riscv/exec_machdep.c Thu Sep 29 06:51:17 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: exec_machdep.c,v 1.2 2020/11/04 07:09:46 skrll Exp $ */ +/* $NetBSD: exec_machdep.c,v 1.3 2022/09/29 06:51:17 skrll Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -30,14 +30,13 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: exec_machdep.c,v 1.2 2020/11/04 07:09:46 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: exec_machdep.c,v 1.3 2022/09/29 06:51:17 skrll Exp $"); #include "opt_execfmt.h" #include #include #include -#include #include #include #include Index: src/sys/arch/riscv/riscv/vm_machdep.c diff -u src/sys/arch/riscv/riscv/vm_machdep.c:1.4 src/sys/arch/riscv/riscv/vm_machdep.c:1.5 --- src/sys/arch/riscv/riscv/vm_machdep.c:1.4 Wed Nov 4 20:04:01 2020 +++ src/sys/arch/riscv/riscv/vm_machdep.c Thu Sep 29 06:51:17 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: vm_machdep.c,v 1.4 2020/11/04 20:04:01 skrll Exp $ */ +/* $NetBSD: vm_machdep.c,v 1.5 2022/09/29 06:51:17 skrll Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.4 2020/11/04 20:04:01 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.5 2022/09/29 06:51:17 skrll Exp $"); #define _PMAP_PRIVATE @@ -39,7 +39,6 @@ __KERNEL_RCSID(0, "$NetBSD: vm_machdep.c #include #include #include -#include #include #include #include
CVS commit: src/sys/arch/riscv/riscv
Module Name:src Committed By: skrll Date: Thu Sep 29 06:51:17 UTC 2022 Modified Files: src/sys/arch/riscv/riscv: exec_machdep.c vm_machdep.c Log Message: Remove unnecessary include of . To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/riscv/exec_machdep.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/riscv/riscv/vm_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/cats/cats
Module Name:src Committed By: skrll Date: Thu Sep 29 06:47:06 UTC 2022 Modified Files: src/sys/arch/cats/cats: autoconf.c Log Message: Remove unnecessary include of . To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/cats/cats/autoconf.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/arch/cats/cats/autoconf.c diff -u src/sys/arch/cats/cats/autoconf.c:1.20 src/sys/arch/cats/cats/autoconf.c:1.21 --- src/sys/arch/cats/cats/autoconf.c:1.20 Thu Sep 29 06:46:17 2022 +++ src/sys/arch/cats/cats/autoconf.c Thu Sep 29 06:47:06 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.20 2022/09/29 06:46:17 skrll Exp $ */ +/* $NetBSD: autoconf.c,v 1.21 2022/09/29 06:47:06 skrll Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.20 2022/09/29 06:46:17 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.21 2022/09/29 06:47:06 skrll Exp $"); #include "opt_md.h" @@ -52,7 +52,6 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v #include #include #include -#include #include #include #include
CVS commit: src/sys/arch/cats/cats
Module Name:src Committed By: skrll Date: Thu Sep 29 06:47:06 UTC 2022 Modified Files: src/sys/arch/cats/cats: autoconf.c Log Message: Remove unnecessary include of . To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/cats/cats/autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/cats/cats
Module Name:src
Committed By: skrll
Date: Thu Sep 29 06:46:17 UTC 2022
Modified Files:
src/sys/arch/cats/cats: autoconf.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/cats/cats/autoconf.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/arch/cats/cats/autoconf.c
diff -u src/sys/arch/cats/cats/autoconf.c:1.19 src/sys/arch/cats/cats/autoconf.c:1.20
--- src/sys/arch/cats/cats/autoconf.c:1.19 Wed Apr 2 11:35:36 2014
+++ src/sys/arch/cats/cats/autoconf.c Thu Sep 29 06:46:17 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.19 2014/04/02 11:35:36 matt Exp $ */
+/* $NetBSD: autoconf.c,v 1.20 2022/09/29 06:46:17 skrll Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2014/04/02 11:35:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.20 2022/09/29 06:46:17 skrll Exp $");
#include "opt_md.h"
@@ -104,7 +104,7 @@ static void
set_root_device(void)
{
char *ptr;
-
+
if (boot_file)
get_device(boot_file);
if (boot_args &&
@@ -174,7 +174,7 @@ device_register(device_t dev, void *aux)
*/
struct pci_attach_args *pa = aux;
if (((pa)->pa_bus == 0
- && (pa)->pa_device == 16
+ && (pa)->pa_device == 16
&& (pa)->pa_function == 0)) {
if (prop_dictionary_set_bool(device_properties(dev),
"ali1543-ide-force-compat-mode",
CVS commit: src/sys/arch/cats/cats
Module Name:src Committed By: skrll Date: Thu Sep 29 06:46:17 UTC 2022 Modified Files: src/sys/arch/cats/cats: autoconf.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/cats/cats/autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/dev
Module Name:src
Committed By: skrll
Date: Thu Sep 29 06:42:14 UTC 2022
Modified Files:
src/sys/arch/hppa/dev: astro.c uturn.c
Log Message:
malloc -> kmem
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hppa/dev/astro.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hppa/dev/uturn.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/arch/hppa/dev/astro.c
diff -u src/sys/arch/hppa/dev/astro.c:1.4 src/sys/arch/hppa/dev/astro.c:1.5
--- src/sys/arch/hppa/dev/astro.c:1.4 Sat Aug 7 16:18:55 2021
+++ src/sys/arch/hppa/dev/astro.c Thu Sep 29 06:42:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: astro.c,v 1.4 2021/08/07 16:18:55 thorpej Exp $ */
+/* $NetBSD: astro.c,v 1.5 2022/09/29 06:42:14 skrll Exp $ */
/* $OpenBSD: astro.c,v 1.8 2007/10/06 23:50:54 krw Exp $ */
@@ -19,10 +19,11 @@
*/
#include
+
#include
#include
#include
-#include
+#include
#include
#include
@@ -185,7 +186,7 @@ paddr_t iommu_dvmamem_mmap(void *, bus_d
void iommu_enter(struct astro_softc *, bus_addr_t, paddr_t, vaddr_t, int);
void iommu_remove(struct astro_softc *, bus_addr_t);
-struct iommu_map_state *iommu_iomap_create(int);
+struct iommu_map_state *iommu_iomap_create(int, int);
void iommu_iomap_destroy(struct iommu_map_state *);
int iommu_iomap_insert_page(struct iommu_map_state *, vaddr_t, paddr_t);
bus_addr_t iommu_iomap_translate(struct iommu_map_state *, paddr_t);
@@ -362,7 +363,7 @@ iommu_dvmamap_create(void *v, bus_size_t
if (error)
return (error);
- ims = iommu_iomap_create(atop(round_page(size)));
+ ims = iommu_iomap_create(atop(round_page(size)), flags);
if (ims == NULL) {
bus_dmamap_destroy(sc->sc_dmat, map);
return (ENOMEM);
@@ -604,7 +605,7 @@ SPLAY_GENERATE(iommu_page_tree, iommu_pa
* Create a new iomap.
*/
struct iommu_map_state *
-iommu_iomap_create(int n)
+iommu_iomap_create(int n, int flags)
{
struct iommu_map_state *ims;
@@ -613,8 +614,10 @@ iommu_iomap_create(int n)
if (n < 16)
n = 16;
- ims = malloc(sizeof(*ims) + (n - 1) * sizeof(ims->ims_map.ipm_map[0]),
- M_DEVBUF, M_NOWAIT | M_ZERO);
+ const size_t sz =
+ sizeof(*ims) + (n - 1) * sizeof(ims->ims_map.ipm_map[0]);
+
+ ims = kmem_zalloc(sz, (flags & BUS_DMA_NOWAIT) ? KM_NOSLEEP : KM_SLEEP);
if (ims == NULL)
return (NULL);
@@ -636,8 +639,11 @@ iommu_iomap_destroy(struct iommu_map_sta
printf("iommu_iomap_destroy: %d page entries in use\n",
ims->ims_map.ipm_pagecnt);
#endif
+ const int n = ims->ims_map.ipm_maxpage;
+ const size_t sz =
+ sizeof(*ims) + (n - 1) * sizeof(ims->ims_map.ipm_map[0]);
- free(ims, M_DEVBUF);
+ kmem_free(ims, sz);
}
/*
Index: src/sys/arch/hppa/dev/uturn.c
diff -u src/sys/arch/hppa/dev/uturn.c:1.5 src/sys/arch/hppa/dev/uturn.c:1.6
--- src/sys/arch/hppa/dev/uturn.c:1.5 Sat Aug 7 16:18:55 2021
+++ src/sys/arch/hppa/dev/uturn.c Thu Sep 29 06:42:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: uturn.c,v 1.5 2021/08/07 16:18:55 thorpej Exp $ */
+/* $NetBSD: uturn.c,v 1.6 2022/09/29 06:42:14 skrll Exp $ */
/* $OpenBSD: uturn.c,v 1.6 2007/12/29 01:26:14 kettenis Exp $ */
@@ -82,12 +82,13 @@
*/
#include
+
#include
#include
-#include
-#include
#include
+#include
#include
+#include
#include
#include
@@ -240,7 +241,7 @@ static void uturn_iommu_enter(struct utu
vaddr_t, paddr_t);
static void uturn_iommu_remove(struct uturn_softc *, bus_addr_t, bus_size_t);
-struct uturn_map_state *uturn_iomap_create(int);
+struct uturn_map_state *uturn_iomap_create(int, int);
void uturn_iomap_destroy(struct uturn_map_state *);
int uturn_iomap_insert_page(struct uturn_map_state *, vaddr_t, paddr_t);
bus_addr_t uturn_iomap_translate(struct uturn_map_state *, paddr_t);
@@ -500,7 +501,7 @@ uturn_dmamap_create(void *v, bus_size_t
if (error)
return (error);
- ums = uturn_iomap_create(atop(round_page(size)));
+ ums = uturn_iomap_create(atop(round_page(size)), flags);
if (ums == NULL) {
bus_dmamap_destroy(sc->sc_dmat, map);
return (ENOMEM);
@@ -743,7 +744,7 @@ SPLAY_GENERATE(uturn_page_tree, uturn_pa
* Create a new iomap.
*/
struct uturn_map_state *
-uturn_iomap_create(int n)
+uturn_iomap_create(int n, int flags)
{
struct uturn_map_state *ums;
@@ -751,9 +752,9 @@ uturn_iomap_create(int n)
n += 4;
if (n < 16)
n = 16;
-
- ums = malloc(sizeof(*ums) + (n - 1) * sizeof(ums->ums_map.upm_map[0]),
- M_DEVBUF, M_NOWAIT | M_ZERO);
+ const size_t sz =
+ sizeof(*ums) + (n - 1) * sizeof(ums->ums_map.upm_map[0]);
+ ums = kmem_zalloc(sz, (flags & BUS_DMA_NOWAIT) ? KM_NOSLEEP : KM_SLEEP);
if (ums == NULL)
return (NULL);
@@ -771,8 +772,11 @@ void
uturn_iomap_destroy(struct uturn_map_state *ums)
{
KASSERT(ums->ums_map.upm_pagecnt == 0);
+ const int n = ums->ums_map.upm_maxpage;
+ const size_t sz =
+ sizeof(*ums) + (n - 1) * sizeof(ums->ums_map.upm_map[0]);
- free(ums, M_DEVBUF);
+ kmem_free(ums,
CVS commit: src/sys/arch/hppa/dev
Module Name:src Committed By: skrll Date: Thu Sep 29 06:42:14 UTC 2022 Modified Files: src/sys/arch/hppa/dev: astro.c uturn.c Log Message: malloc -> kmem To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hppa/dev/astro.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hppa/dev/uturn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa
Module Name:src Committed By: skrll Date: Thu Sep 29 06:39:59 UTC 2022 Modified Files: src/sys/arch/hppa/dev: dino.c elroy.c mem.c src/sys/arch/hppa/gsc: gscbus.c oosiop_gsc.c osiop_gsc.c src/sys/arch/hppa/hppa: core_machdep.c intr.c machdep.c vm_machdep.c Log Message: Remove unnecessary include of . To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hppa/dev/dino.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hppa/dev/elroy.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/dev/mem.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hppa/gsc/gscbus.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/gsc/oosiop_gsc.c \ src/sys/arch/hppa/gsc/osiop_gsc.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hppa/hppa/core_machdep.c \ src/sys/arch/hppa/hppa/intr.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hppa/hppa/machdep.c cvs rdiff -u -r1.56 -r1.57 src/sys/arch/hppa/hppa/vm_machdep.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/arch/hppa/dev/dino.c diff -u src/sys/arch/hppa/dev/dino.c:1.15 src/sys/arch/hppa/dev/dino.c:1.16 --- src/sys/arch/hppa/dev/dino.c:1.15 Tue Aug 16 08:40:33 2022 +++ src/sys/arch/hppa/dev/dino.c Thu Sep 29 06:39:58 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: dino.c,v 1.15 2022/08/16 08:40:33 skrll Exp $ */ +/* $NetBSD: dino.c,v 1.16 2022/09/29 06:39:58 skrll Exp $ */ /* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.15 2022/08/16 08:40:33 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.16 2022/09/29 06:39:58 skrll Exp $"); /* #include "cardbus.h" */ @@ -37,7 +37,6 @@ __KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.1 #include #include #include -#include #include #include Index: src/sys/arch/hppa/dev/elroy.c diff -u src/sys/arch/hppa/dev/elroy.c:1.5 src/sys/arch/hppa/dev/elroy.c:1.6 --- src/sys/arch/hppa/dev/elroy.c:1.5 Tue Aug 16 08:40:33 2022 +++ src/sys/arch/hppa/dev/elroy.c Thu Sep 29 06:39:58 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: elroy.c,v 1.5 2022/08/16 08:40:33 skrll Exp $ */ +/* $NetBSD: elroy.c,v 1.6 2022/09/29 06:39:58 skrll Exp $ */ /* $OpenBSD: elroy.c,v 1.5 2009/03/30 21:24:57 kettenis Exp $ */ @@ -25,7 +25,6 @@ #include #include #include -#include #include #include Index: src/sys/arch/hppa/dev/mem.c diff -u src/sys/arch/hppa/dev/mem.c:1.1 src/sys/arch/hppa/dev/mem.c:1.2 --- src/sys/arch/hppa/dev/mem.c:1.1 Mon Feb 24 07:23:42 2014 +++ src/sys/arch/hppa/dev/mem.c Thu Sep 29 06:39:58 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: mem.c,v 1.1 2014/02/24 07:23:42 skrll Exp $ */ +/* $NetBSD: mem.c,v 1.2 2022/09/29 06:39:58 skrll Exp $ */ /* $OpenBSD: mem.c,v 1.30 2007/09/22 16:21:32 krw Exp $ */ /* @@ -73,13 +73,12 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.1 2014/02/24 07:23:42 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.2 2022/09/29 06:39:58 skrll Exp $"); #include #include #include #include -#include #include #include #include Index: src/sys/arch/hppa/gsc/gscbus.c diff -u src/sys/arch/hppa/gsc/gscbus.c:1.3 src/sys/arch/hppa/gsc/gscbus.c:1.4 --- src/sys/arch/hppa/gsc/gscbus.c:1.3 Sat Aug 7 16:18:55 2021 +++ src/sys/arch/hppa/gsc/gscbus.c Thu Sep 29 06:39:58 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: gscbus.c,v 1.3 2021/08/07 16:18:55 thorpej Exp $ */ +/* $NetBSD: gscbus.c,v 1.4 2022/09/29 06:39:58 skrll Exp $ */ /* $OpenBSD: gscbus.c,v 1.13 2001/08/01 20:32:04 miod Exp $ */ @@ -68,7 +68,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: gscbus.c,v 1.3 2021/08/07 16:18:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gscbus.c,v 1.4 2022/09/29 06:39:58 skrll Exp $"); #define GSCDEBUG @@ -77,7 +77,6 @@ __KERNEL_RCSID(0, "$NetBSD: gscbus.c,v 1 #include #include #include -#include #include #include Index: src/sys/arch/hppa/gsc/oosiop_gsc.c diff -u src/sys/arch/hppa/gsc/oosiop_gsc.c:1.1 src/sys/arch/hppa/gsc/oosiop_gsc.c:1.2 --- src/sys/arch/hppa/gsc/oosiop_gsc.c:1.1 Mon Feb 24 07:23:43 2014 +++ src/sys/arch/hppa/gsc/oosiop_gsc.c Thu Sep 29 06:39:58 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: oosiop_gsc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ +/* $NetBSD: oosiop_gsc.c,v 1.2 2022/09/29 06:39:58 skrll Exp $ */ /* * Copyright (c) 2001 Matt Fredette. All rights reserved. @@ -80,13 +80,12 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: oosiop_gsc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: oosiop_gsc.c,v 1.2 2022/09/29 06:39:58 skrll Exp $"); #include #include #include #include -#include #include #include Index: src/sys/arch/hppa/gsc/osiop_gsc.c diff -u src/sys/arch/hppa/gsc/osiop_gsc.c:1.1 src/sys/arch/hppa/gsc/osiop_gsc.c:1.2 --- src/sys/arch/hppa/gsc/osiop_gsc.c:1.1 Mon Feb 24 07:23:43 2014 +++ src/sys/arch/hppa/gsc/osiop_gsc.c Thu Sep 29 06:39:58 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: osiop_gsc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ +/* $NetBSD:
CVS commit: src/sys/arch/hppa
Module Name:src Committed By: skrll Date: Thu Sep 29 06:39:59 UTC 2022 Modified Files: src/sys/arch/hppa/dev: dino.c elroy.c mem.c src/sys/arch/hppa/gsc: gscbus.c oosiop_gsc.c osiop_gsc.c src/sys/arch/hppa/hppa: core_machdep.c intr.c machdep.c vm_machdep.c Log Message: Remove unnecessary include of . To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hppa/dev/dino.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hppa/dev/elroy.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/dev/mem.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hppa/gsc/gscbus.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/gsc/oosiop_gsc.c \ src/sys/arch/hppa/gsc/osiop_gsc.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hppa/hppa/core_machdep.c \ src/sys/arch/hppa/hppa/intr.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hppa/hppa/machdep.c cvs rdiff -u -r1.56 -r1.57 src/sys/arch/hppa/hppa/vm_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
