CVS commit: src/sys/netinet
Module Name:src Committed By: mlelstv Date: Sun Mar 26 10:32:38 UTC 2023 Modified Files: src/sys/netinet: ip_carp.c Log Message: Use backing device to send advertisements. Otherwise the packets originate from the virtual MAC address, which confuses switches. To generate a diff of this commit: cvs rdiff -u -r1.117 -r1.118 src/sys/netinet/ip_carp.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/netinet/ip_carp.c diff -u src/sys/netinet/ip_carp.c:1.117 src/sys/netinet/ip_carp.c:1.118 --- src/sys/netinet/ip_carp.c:1.117 Fri Sep 2 23:48:11 2022 +++ src/sys/netinet/ip_carp.c Sun Mar 26 10:32:38 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_carp.c,v 1.117 2022/09/02 23:48:11 thorpej Exp $ */ +/* $NetBSD: ip_carp.c,v 1.118 2023/03/26 10:32:38 mlelstv Exp $ */ /* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */ /* @@ -33,7 +33,7 @@ #endif #include -__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.117 2022/09/02 23:48:11 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.118 2023/03/26 10:32:38 mlelstv Exp $"); /* * TODO: @@ -1876,6 +1876,9 @@ carp_join_multicast(struct carp_softc *s struct ip_moptions *imo = >sc_imo, tmpimo; struct in_addr addr; + if (sc->sc_carpdev == NULL) + return (ENETDOWN); + memset(, 0, sizeof(tmpimo)); addr.s_addr = INADDR_CARP_GROUP; if ((tmpimo.imo_membership[0] = @@ -1885,7 +1888,7 @@ carp_join_multicast(struct carp_softc *s imo->imo_membership[0] = tmpimo.imo_membership[0]; imo->imo_num_memberships = 1; - imo->imo_multicast_if_index = sc->sc_if.if_index; + imo->imo_multicast_if_index = sc->sc_carpdev->if_index; imo->imo_multicast_ttl = CARP_DFLTTL; imo->imo_multicast_loop = 0; return (0); @@ -1970,6 +1973,9 @@ carp_join_multicast6(struct carp_softc * struct sockaddr_in6 addr6; int error; + if (sc->sc_carpdev == NULL) + return (ENETDOWN); + /* Join IPv6 CARP multicast group */ memset(, 0, sizeof(addr6)); addr6.sin6_family = AF_INET6; @@ -1996,7 +2002,7 @@ carp_join_multicast6(struct carp_softc * } /* apply v6 multicast membership */ - im6o->im6o_multicast_if_index = sc->sc_if.if_index; + im6o->im6o_multicast_if_index = sc->sc_carpdev->if_index; if (imm) LIST_INSERT_HEAD(>im6o_memberships, imm, i6mm_chain);
CVS commit: src/sys/netinet
Module Name:src Committed By: mlelstv Date: Sun Mar 26 10:32:38 UTC 2023 Modified Files: src/sys/netinet: ip_carp.c Log Message: Use backing device to send advertisements. Otherwise the packets originate from the virtual MAC address, which confuses switches. To generate a diff of this commit: cvs rdiff -u -r1.117 -r1.118 src/sys/netinet/ip_carp.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/vax/vax
Module Name:src Committed By: ragge Date: Sun Mar 26 12:21:09 UTC 2023 Modified Files: src/sys/arch/vax/vax: pmap.c Log Message: Ensure that the kernel do not try to allocate a S0 segment larger than 1G, since the hardware prohibits that. To generate a diff of this commit: cvs rdiff -u -r1.195 -r1.196 src/sys/arch/vax/vax/pmap.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/vax/vax/pmap.c diff -u src/sys/arch/vax/vax/pmap.c:1.195 src/sys/arch/vax/vax/pmap.c:1.196 --- src/sys/arch/vax/vax/pmap.c:1.195 Sun Dec 11 18:02:40 2022 +++ src/sys/arch/vax/vax/pmap.c Sun Mar 26 12:21:09 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.195 2022/12/11 18:02:40 oster Exp $ */ +/* $NetBSD: pmap.c,v 1.196 2023/03/26 12:21:09 ragge Exp $ */ /* * Copyright (c) 1994, 1998, 1999, 2003 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -25,7 +25,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.195 2022/12/11 18:02:40 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.196 2023/03/26 12:21:09 ragge Exp $"); #include "opt_ddb.h" #include "opt_cputype.h" @@ -276,6 +276,15 @@ pmap_bootstrap(void) usrptsize = (avail_end/(20 * PPTESZ)) * VAX_NBPG; kvmsize = calc_kvmsize(usrptsize); + /* + * Ensure that not more than 1G is allocated, since that is + * max size of S0 space. + * Also note that for full S0 space the SLR should be 0x20, + * since the comparison in the vax microcode is >= SLR. + */ +#define S0SPACE (1*1024*1024*1024) + if (kvmsize > S0SPACE) + kvmsize = S0SPACE; sysptsize = kvmsize >> VAX_PGSHIFT; /* * Virtual_* and avail_* is used for mapping of system page table.
CVS commit: src/sys/arch/vax/vax
Module Name:src Committed By: ragge Date: Sun Mar 26 12:21:09 UTC 2023 Modified Files: src/sys/arch/vax/vax: pmap.c Log Message: Ensure that the kernel do not try to allocate a S0 segment larger than 1G, since the hardware prohibits that. To generate a diff of this commit: cvs rdiff -u -r1.195 -r1.196 src/sys/arch/vax/vax/pmap.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/vax/include
Module Name:src Committed By: ragge Date: Sun Mar 26 12:23:42 UTC 2023 Modified Files: src/sys/arch/vax/include: trap.h Log Message: Change CASMAGIC to 0xFEDABABE so that it cannot accidentally end up in valid kernel memory. Due to the VARM accesses above S0 should always give a ptelen trap. Bug found by Kalvis Duckmanton. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/vax/include/trap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/vax/include
Module Name:src Committed By: ragge Date: Sun Mar 26 12:23:42 UTC 2023 Modified Files: src/sys/arch/vax/include: trap.h Log Message: Change CASMAGIC to 0xFEDABABE so that it cannot accidentally end up in valid kernel memory. Due to the VARM accesses above S0 should always give a ptelen trap. Bug found by Kalvis Duckmanton. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/vax/include/trap.h 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/vax/include/trap.h diff -u src/sys/arch/vax/include/trap.h:1.24 src/sys/arch/vax/include/trap.h:1.25 --- src/sys/arch/vax/include/trap.h:1.24 Sun Jul 3 02:18:20 2011 +++ src/sys/arch/vax/include/trap.h Sun Mar 26 12:23:42 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.h,v 1.24 2011/07/03 02:18:20 matt Exp $ */ +/* $NetBSD: trap.h,v 1.25 2023/03/26 12:23:42 ragge Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -74,7 +74,7 @@ #define AFLT_FLTUND 0xa /* floating underflow */ /* Used by RAS to detect an interrupted CAS */ -#define CASMAGIC 0xBEDABABE /* high end of S0 space */ +#define CASMAGIC 0xFEDABABE /* always invalid space */ /* Trap's coming from user mode */ #define T_USER 0x100
CVS commit: src/sys/arch
Module Name:src Committed By: andvar Date: Sun Mar 26 15:24:22 UTC 2023 Modified Files: src/sys/arch/amiga/dev: view.c viewioctl.h viewvar.h src/sys/arch/atari/dev: view.c viewvar.h Log Message: s/dipslay/display/ in comments. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/amiga/dev/view.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/amiga/dev/viewioctl.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amiga/dev/viewvar.h cvs rdiff -u -r1.38 -r1.39 src/sys/arch/atari/dev/view.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/atari/dev/viewvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: andvar Date: Sun Mar 26 15:24:22 UTC 2023 Modified Files: src/sys/arch/amiga/dev: view.c viewioctl.h viewvar.h src/sys/arch/atari/dev: view.c viewvar.h Log Message: s/dipslay/display/ in comments. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/amiga/dev/view.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/amiga/dev/viewioctl.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amiga/dev/viewvar.h cvs rdiff -u -r1.38 -r1.39 src/sys/arch/atari/dev/view.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/atari/dev/viewvar.h 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/amiga/dev/view.c diff -u src/sys/arch/amiga/dev/view.c:1.34 src/sys/arch/amiga/dev/view.c:1.35 --- src/sys/arch/amiga/dev/view.c:1.34 Sun Sep 19 10:34:07 2021 +++ src/sys/arch/amiga/dev/view.c Sun Mar 26 15:24:22 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: view.c,v 1.34 2021/09/19 10:34:07 andvar Exp $ */ +/* $NetBSD: view.c,v 1.35 2023/03/26 15:24:22 andvar Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps @@ -31,14 +31,14 @@ */ /* The view major device is a placeholder device. It serves - * simply to map the semantics of a graphics dipslay to + * simply to map the semantics of a graphics display to * the semantics of a character block device. In other * words the graphics system as currently built does not like to be * referred to by open/close/ioctl. This device serves as * a interface to graphics. */ #include -__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.34 2021/09/19 10:34:07 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.35 2023/03/26 15:24:22 andvar Exp $"); #include #include Index: src/sys/arch/amiga/dev/viewioctl.h diff -u src/sys/arch/amiga/dev/viewioctl.h:1.11 src/sys/arch/amiga/dev/viewioctl.h:1.12 --- src/sys/arch/amiga/dev/viewioctl.h:1.11 Sun Sep 19 10:34:07 2021 +++ src/sys/arch/amiga/dev/viewioctl.h Sun Mar 26 15:24:22 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: viewioctl.h,v 1.11 2021/09/19 10:34:07 andvar Exp $ */ +/* $NetBSD: viewioctl.h,v 1.12 2023/03/26 15:24:22 andvar Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps @@ -32,7 +32,7 @@ /* * The view major device is a placeholder device. It serves - * simply to map the semantics of a graphics dipslay to + * simply to map the semantics of a graphics display to * the semantics of a character block device. In other * words the graphics system as currently built does not like to be * referred to by open/close/ioctl. This device serves as Index: src/sys/arch/amiga/dev/viewvar.h diff -u src/sys/arch/amiga/dev/viewvar.h:1.5 src/sys/arch/amiga/dev/viewvar.h:1.6 --- src/sys/arch/amiga/dev/viewvar.h:1.5 Sun Sep 19 10:34:07 2021 +++ src/sys/arch/amiga/dev/viewvar.h Sun Mar 26 15:24:22 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: viewvar.h,v 1.5 2021/09/19 10:34:07 andvar Exp $ */ +/* $NetBSD: viewvar.h,v 1.6 2023/03/26 15:24:22 andvar Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps @@ -31,7 +31,7 @@ */ /* The view major device is a placeholder device. It serves - * simply to map the semantics of a graphics dipslay to + * simply to map the semantics of a graphics display to * the semantics of a character block device. In other * words the graphics system as currently built does not like to be * referred to by open/close/ioctl. This device serves as Index: src/sys/arch/atari/dev/view.c diff -u src/sys/arch/atari/dev/view.c:1.38 src/sys/arch/atari/dev/view.c:1.39 --- src/sys/arch/atari/dev/view.c:1.38 Fri Jan 6 10:28:28 2023 +++ src/sys/arch/atari/dev/view.c Sun Mar 26 15:24:21 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: view.c,v 1.38 2023/01/06 10:28:28 tsutsui Exp $ */ +/* $NetBSD: view.c,v 1.39 2023/03/26 15:24:21 andvar Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps @@ -31,14 +31,14 @@ */ /* The view major device is a placeholder device. It serves - * simply to map the semantics of a graphics dipslay to + * simply to map the semantics of a graphics display to * the semantics of a character block device. In other * words the graphics system as currently built does not like to be * referred to by open/close/ioctl. This device serves as * a interface to graphics. */ #include -__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.38 2023/01/06 10:28:28 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.39 2023/03/26 15:24:21 andvar Exp $"); #include #include Index: src/sys/arch/atari/dev/viewvar.h diff -u src/sys/arch/atari/dev/viewvar.h:1.8 src/sys/arch/atari/dev/viewvar.h:1.9 --- src/sys/arch/atari/dev/viewvar.h:1.8 Sun Sep 19 10:34:08 2021 +++ src/sys/arch/atari/dev/viewvar.h Sun Mar 26 15:24:21 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: viewvar.h,v 1.8 2021/09/19 10:34:08 andvar Exp $ */ +/* $NetBSD: viewvar.h,v 1.9 2023/03/26 15:24:21 andvar Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps @@ -31,7 +31,7 @@ */ /* The view major device is a
CVS commit: src/distrib
Module Name:src Committed By: andvar Date: Sun Mar 26 15:08:24 UTC 2023 Modified Files: src/distrib/alpha/instkernel/ramdisk: install.sh upgrade.sh src/distrib/hp300/miniroot: install.md src/distrib/mac68k/miniroot: install.md src/distrib/mvme68k/miniroot: install.md Log Message: s/displyed/displayed/ To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/distrib/alpha/instkernel/ramdisk/install.sh cvs rdiff -u -r1.4 -r1.5 src/distrib/alpha/instkernel/ramdisk/upgrade.sh cvs rdiff -u -r1.20 -r1.21 src/distrib/hp300/miniroot/install.md cvs rdiff -u -r1.8 -r1.9 src/distrib/mac68k/miniroot/install.md cvs rdiff -u -r1.10 -r1.11 src/distrib/mvme68k/miniroot/install.md Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib
Module Name:src Committed By: andvar Date: Sun Mar 26 15:08:24 UTC 2023 Modified Files: src/distrib/alpha/instkernel/ramdisk: install.sh upgrade.sh src/distrib/hp300/miniroot: install.md src/distrib/mac68k/miniroot: install.md src/distrib/mvme68k/miniroot: install.md Log Message: s/displyed/displayed/ To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/distrib/alpha/instkernel/ramdisk/install.sh cvs rdiff -u -r1.4 -r1.5 src/distrib/alpha/instkernel/ramdisk/upgrade.sh cvs rdiff -u -r1.20 -r1.21 src/distrib/hp300/miniroot/install.md cvs rdiff -u -r1.8 -r1.9 src/distrib/mac68k/miniroot/install.md cvs rdiff -u -r1.10 -r1.11 src/distrib/mvme68k/miniroot/install.md Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/alpha/instkernel/ramdisk/install.sh diff -u src/distrib/alpha/instkernel/ramdisk/install.sh:1.7 src/distrib/alpha/instkernel/ramdisk/install.sh:1.8 --- src/distrib/alpha/instkernel/ramdisk/install.sh:1.7 Tue Sep 29 02:49:55 2020 +++ src/distrib/alpha/instkernel/ramdisk/install.sh Sun Mar 26 15:08:24 2023 @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: install.sh,v 1.7 2020/09/29 02:49:55 msaitoh Exp $ +# $NetBSD: install.sh,v 1.8 2023/03/26 15:08:24 andvar Exp $ # # Copyright (c) 1997 Perry E. Metzger # Copyright (c) 1994 Christopher G. Demetriou @@ -72,7 +72,7 @@ echo "program can cause SIGNIFICANT data echo "to make sure your hard drive is backed up before beginning the" echo "installation process." echo "" -echo "Default answers are displyed in brackets after the questions." +echo "Default answers are displayed in brackets after the questions." echo "You can hit Control-C at any time to quit, but if you do so at a" echo "prompt, you may have to hit return. Also, quitting in the middle of" echo "installation may leave your system in an inconsistent state." Index: src/distrib/alpha/instkernel/ramdisk/upgrade.sh diff -u src/distrib/alpha/instkernel/ramdisk/upgrade.sh:1.4 src/distrib/alpha/instkernel/ramdisk/upgrade.sh:1.5 --- src/distrib/alpha/instkernel/ramdisk/upgrade.sh:1.4 Mon Aug 9 19:24:32 2021 +++ src/distrib/alpha/instkernel/ramdisk/upgrade.sh Sun Mar 26 15:08:24 2023 @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: upgrade.sh,v 1.4 2021/08/09 19:24:32 andvar Exp $ +# $NetBSD: upgrade.sh,v 1.5 2023/03/26 15:08:24 andvar Exp $ # # Copyright (c) 1997 Perry E. Metzger # Copyright (c) 1994 Christopher G. Demetriou @@ -69,7 +69,7 @@ echo "program can cause SIGNIFICANT data echo "to make sure your hard drive is backed up before beginning the" echo "upgrade process." echo "" -echo "Default answers are displyed in brackets after the questions." +echo "Default answers are displayed in brackets after the questions." echo "You can hit Control-C at any time to quit, but if you do so at a" echo "prompt, you may have to hit return. Also, quitting in the middle of" echo "the upgrade may leave your system in an inconsistent (and unusable)" Index: src/distrib/hp300/miniroot/install.md diff -u src/distrib/hp300/miniroot/install.md:1.20 src/distrib/hp300/miniroot/install.md:1.21 --- src/distrib/hp300/miniroot/install.md:1.20 Sat Dec 5 18:52:06 2020 +++ src/distrib/hp300/miniroot/install.md Sun Mar 26 15:08:24 2023 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: install.md,v 1.20 2020/12/05 18:52:06 tsutsui Exp $ +# $NetBSD: install.md,v 1.21 2023/03/26 15:08:24 andvar Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -497,7 +497,7 @@ program can cause SIGNIFICANT data loss, to make sure your hard drive is backed up before beginning the installation process. -Default answers are displyed in brackets after the questions. +Default answers are displayed in brackets after the questions. You can hit Control-C at any time to quit, but if you do so at a prompt, you may have to hit return. Also, quitting in the middle of installation may leave your system in an inconsistent state. Index: src/distrib/mac68k/miniroot/install.md diff -u src/distrib/mac68k/miniroot/install.md:1.8 src/distrib/mac68k/miniroot/install.md:1.9 --- src/distrib/mac68k/miniroot/install.md:1.8 Sat Dec 5 18:52:06 2020 +++ src/distrib/mac68k/miniroot/install.md Sun Mar 26 15:08:24 2023 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: install.md,v 1.8 2020/12/05 18:52:06 tsutsui Exp $ +# $NetBSD: install.md,v 1.9 2023/03/26 15:08:24 andvar Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -149,7 +149,7 @@ program can cause SIGNIFICANT data loss, to make sure your hard drive is backed up before beginning the installation process. -Default answers are displyed in brackets after the questions. +Default answers are displayed in brackets after the questions. You can hit Control-C at any time to quit, but if you do so at a prompt, you may have to hit return. Also, quitting in the middle of installation may leave your
CVS commit: src/sys/arch
Module Name:src Committed By: andvar Date: Sun Mar 26 15:12:34 UTC 2023 Modified Files: src/sys/arch/mac68k/dev: ite_compat.c src/sys/arch/vax/vsa: smg.c Log Message: s/diplay/display/ and s/DIPPLAY/DISPLAY/ in comments. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mac68k/dev/ite_compat.c cvs rdiff -u -r1.64 -r1.65 src/sys/arch/vax/vsa/smg.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
Module Name:src Committed By: andvar Date: Sun Mar 26 15:12:34 UTC 2023 Modified Files: src/sys/arch/mac68k/dev: ite_compat.c src/sys/arch/vax/vsa: smg.c Log Message: s/diplay/display/ and s/DIPPLAY/DISPLAY/ in comments. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mac68k/dev/ite_compat.c cvs rdiff -u -r1.64 -r1.65 src/sys/arch/vax/vsa/smg.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/mac68k/dev/ite_compat.c diff -u src/sys/arch/mac68k/dev/ite_compat.c:1.13 src/sys/arch/mac68k/dev/ite_compat.c:1.14 --- src/sys/arch/mac68k/dev/ite_compat.c:1.13 Thu Aug 20 14:40:17 2015 +++ src/sys/arch/mac68k/dev/ite_compat.c Sun Mar 26 15:12:34 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ite_compat.c,v 1.13 2015/08/20 14:40:17 christos Exp $ */ +/* $NetBSD: ite_compat.c,v 1.14 2023/03/26 15:12:34 andvar Exp $ */ /* * Copyright (C) 2000 Scott Reynolds @@ -30,13 +30,13 @@ /* * The main thing to realize about this emulator is that the old console * emulator was largely compatible with the DEC VT-220. Since the - * wsdiplay driver has a more complete emulation of that terminal, it's + * wsdisplay driver has a more complete emulation of that terminal, it's * reasonable to pass virtually everything up to that driver without * modification. */ #include -__KERNEL_RCSID(0, "$NetBSD: ite_compat.c,v 1.13 2015/08/20 14:40:17 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ite_compat.c,v 1.14 2023/03/26 15:12:34 andvar Exp $"); #include "ite.h" #include "wsdisplay.h" Index: src/sys/arch/vax/vsa/smg.c diff -u src/sys/arch/vax/vsa/smg.c:1.64 src/sys/arch/vax/vsa/smg.c:1.65 --- src/sys/arch/vax/vsa/smg.c:1.64 Sat Feb 11 05:59:39 2023 +++ src/sys/arch/vax/vsa/smg.c Sun Mar 26 15:12:34 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: smg.c,v 1.64 2023/02/11 05:59:39 tsutsui Exp $ */ +/* $NetBSD: smg.c,v 1.65 2023/03/26 15:12:34 andvar Exp $ */ /* $OpenBSD: smg.c,v 1.28 2014/12/23 21:39:12 miod Exp $ */ /* * Copyright (c) 2006, Miodrag Vallat @@ -117,7 +117,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.64 2023/02/11 05:59:39 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.65 2023/03/26 15:12:34 andvar Exp $"); #include "dzkbd.h" #include "wsdisplay.h" @@ -675,7 +675,7 @@ smg_putchar(void *cookie, int row, int s * WSDISPLAY_FONTORDER_R2L to use proper shift ops. * On the other hand, VRAM data is stored in * WSDISPLAY_FONTORDER_R2L bitorder and - * WSDIPPLAY_FONTORDER_L2R byteorder. + * WSDISPLAY_FONTORDER_L2R byteorder. */ glyph = 0; for (i = ri->ri_font->stride; i != 0; i--)
CVS commit: src
Module Name:src Committed By: andvar Date: Sun Mar 26 19:10:34 UTC 2023 Modified Files: src/common/lib/libprop: prop_array.c prop_array_util.3 src/doc: BRANCHES src/sys/arch/arm/rockchip: rk3399_pcie.c src/sys/arch/hppa/include: pdc.h src/sys/arch/mvme68k/mvme68k: machdep.c src/sys/arch/playstation2/include: kloader.h src/sys/dev/pci: if_ixl.c src/sys/dev/pci/cxgb: cxgb_xgmac.c src/sys/net/agr: if_agrvar_impl.h src/sys/netbt: bt_sysctl.c src/tests/net/if_bridge: t_rtable.sh src/usr.sbin/rarpd: rarpd.c src/usr.sbin/sysinst/arch/evbsh3: md.c Log Message: fix various typos in documentation, comments and sysctl device description. mainly aion -> ation and inlude -> include. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/common/lib/libprop/prop_array.c cvs rdiff -u -r1.11 -r1.12 src/common/lib/libprop/prop_array_util.3 cvs rdiff -u -r1.366 -r1.367 src/doc/BRANCHES cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/rockchip/rk3399_pcie.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/include/pdc.h cvs rdiff -u -r1.159 -r1.160 src/sys/arch/mvme68k/mvme68k/machdep.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/playstation2/include/kloader.h cvs rdiff -u -r1.88 -r1.89 src/sys/dev/pci/if_ixl.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/cxgb/cxgb_xgmac.c cvs rdiff -u -r1.11 -r1.12 src/sys/net/agr/if_agrvar_impl.h cvs rdiff -u -r1.3 -r1.4 src/sys/netbt/bt_sysctl.c cvs rdiff -u -r1.7 -r1.8 src/tests/net/if_bridge/t_rtable.sh cvs rdiff -u -r1.60 -r1.61 src/usr.sbin/rarpd/rarpd.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/evbsh3/md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libprop/prop_array.c diff -u src/common/lib/libprop/prop_array.c:1.21 src/common/lib/libprop/prop_array.c:1.22 --- src/common/lib/libprop/prop_array.c:1.21 Fri Jul 27 09:10:59 2012 +++ src/common/lib/libprop/prop_array.c Sun Mar 26 19:10:32 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: prop_array.c,v 1.21 2012/07/27 09:10:59 pooka Exp $ */ +/* $NetBSD: prop_array.c,v 1.22 2023/03/26 19:10:32 andvar Exp $ */ /*- * Copyright (c) 2006, 2007 The NetBSD Foundation, Inc. @@ -488,7 +488,7 @@ prop_array_count(prop_array_t pa) /* * prop_array_ensure_capacity -- * Ensure that the array has the capacity to store the specified - * total number of objects (inluding the objects already stored + * total number of objects (including the objects already stored * in the array). */ bool Index: src/common/lib/libprop/prop_array_util.3 diff -u src/common/lib/libprop/prop_array_util.3:1.11 src/common/lib/libprop/prop_array_util.3:1.12 --- src/common/lib/libprop/prop_array_util.3:1.11 Sat Jun 6 21:25:59 2020 +++ src/common/lib/libprop/prop_array_util.3 Sun Mar 26 19:10:32 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: prop_array_util.3,v 1.11 2020/06/06 21:25:59 thorpej Exp $ +.\" $NetBSD: prop_array_util.3,v 1.12 2023/03/26 19:10:32 andvar Exp $ .\" .\" Copyright (c) 2006, 2020 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -357,7 +357,7 @@ and do not copy the data that is set or returned. See .Xr prop_data 3 -for more informtaion. +for more information. .Pp The .Fn prop_array_get_string , Index: src/doc/BRANCHES diff -u src/doc/BRANCHES:1.366 src/doc/BRANCHES:1.367 --- src/doc/BRANCHES:1.366 Fri Dec 16 17:35:42 2022 +++ src/doc/BRANCHES Sun Mar 26 19:10:32 2023 @@ -1,4 +1,4 @@ -# $NetBSD: BRANCHES,v 1.366 2022/12/16 17:35:42 martin Exp $ +# $NetBSD: BRANCHES,v 1.367 2023/03/26 19:10:32 andvar Exp $ # # This file contains a list of branches that exist in the NetBSD CVS # tree and their current state. @@ -764,7 +764,7 @@ End Date: Sun Aug 19 2021 Base Tag: thorpej-futex-base Maintainer: Jason Thorpe Scope: src/sys src/tests/lib/libc/sys src/distrib/sets/lists -Notes: Normal futex operataions pass the test suite, but there are +Notes: Normal futex operations pass the test suite, but there are issues with Linux compatibility currently, that need to be addressed before merging. Also includes new NetBSD extensions to the futex interface to support reader/writer locks. Those Index: src/sys/arch/arm/rockchip/rk3399_pcie.c diff -u src/sys/arch/arm/rockchip/rk3399_pcie.c:1.19 src/sys/arch/arm/rockchip/rk3399_pcie.c:1.20 --- src/sys/arch/arm/rockchip/rk3399_pcie.c:1.19 Sat Oct 15 11:07:39 2022 +++ src/sys/arch/arm/rockchip/rk3399_pcie.c Sun Mar 26 19:10:33 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: rk3399_pcie.c,v 1.19 2022/10/15 11:07:39 jmcneill Exp $ */ +/* $NetBSD: rk3399_pcie.c,v 1.20 2023/03/26 19:10:33 andvar Exp $ */ /* * Copyright (c) 2018 Mark Kettenis * @@ -17,7 +17,7 @@ #include -__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.19 2022/10/15 11:07:39 jmcneill Exp $"); +__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.20 2023/03/26 19:10:33 andvar Exp $"); #include #include @@ -261,7 +261,7 @@
CVS commit: src
Module Name:src Committed By: andvar Date: Sun Mar 26 19:10:34 UTC 2023 Modified Files: src/common/lib/libprop: prop_array.c prop_array_util.3 src/doc: BRANCHES src/sys/arch/arm/rockchip: rk3399_pcie.c src/sys/arch/hppa/include: pdc.h src/sys/arch/mvme68k/mvme68k: machdep.c src/sys/arch/playstation2/include: kloader.h src/sys/dev/pci: if_ixl.c src/sys/dev/pci/cxgb: cxgb_xgmac.c src/sys/net/agr: if_agrvar_impl.h src/sys/netbt: bt_sysctl.c src/tests/net/if_bridge: t_rtable.sh src/usr.sbin/rarpd: rarpd.c src/usr.sbin/sysinst/arch/evbsh3: md.c Log Message: fix various typos in documentation, comments and sysctl device description. mainly aion -> ation and inlude -> include. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/common/lib/libprop/prop_array.c cvs rdiff -u -r1.11 -r1.12 src/common/lib/libprop/prop_array_util.3 cvs rdiff -u -r1.366 -r1.367 src/doc/BRANCHES cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/rockchip/rk3399_pcie.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/include/pdc.h cvs rdiff -u -r1.159 -r1.160 src/sys/arch/mvme68k/mvme68k/machdep.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/playstation2/include/kloader.h cvs rdiff -u -r1.88 -r1.89 src/sys/dev/pci/if_ixl.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/cxgb/cxgb_xgmac.c cvs rdiff -u -r1.11 -r1.12 src/sys/net/agr/if_agrvar_impl.h cvs rdiff -u -r1.3 -r1.4 src/sys/netbt/bt_sysctl.c cvs rdiff -u -r1.7 -r1.8 src/tests/net/if_bridge/t_rtable.sh cvs rdiff -u -r1.60 -r1.61 src/usr.sbin/rarpd/rarpd.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/evbsh3/md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
