From 6584ea569e012fd0ff81a624a9d9a99240aa01aa Mon Sep 17 00:00:00 2001 From: andvar Date: Mon, 9 Aug 2021 20:49:08 +0000 Subject: [PATCH] fix various typos in compatibility, mainly in comments. --- doc/BRANCHES | 4 +- doc/TODO.modules | 4 +- include/netdb.h | 4 +- include/string.h | 4 +- .../compat/arch/hppa/sys/compat_sigpending.S | 4 +- .../compat/arch/hppa/sys/compat_sigprocmask.S | 4 +- .../compat/arch/hppa/sys/compat_sigreturn.S | 4 +- .../compat/arch/hppa/sys/compat_sigsuspend.S | 4 +- lib/libc/gen/isinfd_ieee754.c | 6 +-- lib/libc/gen/isnand_ieee754.c | 6 +-- sys/arch/sandpoint/stand/altboot/brdsetup.c | 6 +-- sys/compat/common/Makefile.sysio | 6 +-- sys/compat/common/files.common | 4 +- sys/ddb/db_command.h | 4 +- sys/dev/acpi/acpi_util.c | 6 +-- sys/dev/gpio/gpio.c | 6 +-- sys/dev/i2c/dbcool.c | 6 +-- sys/dev/ic/ath.c | 6 +-- sys/dev/ic/dp8390var.h | 4 +- sys/dev/ic/sl811hs.c | 6 +-- sys/kern/compat_stub.c | 40 +++++++++---------- sys/kern/sys_ptrace_common.c | 6 +-- sys/kern/tty_conf.c | 6 +-- sys/modules/Makefile | 4 +- sys/net/if.h | 4 +- sys/net/route.h | 4 +- sys/netinet/sctp_pcb.h | 4 +- sys/netipsec/key.h | 4 +- usr.bin/find/option.c | 8 ++-- usr.sbin/rpc.pcnfsd/README | 4 +- 30 files changed, 91 insertions(+), 91 deletions(-) diff --git a/doc/BRANCHES b/doc/BRANCHES index 3a22dd43c2ce..8a537838452a 100644 --- a/doc/BRANCHES +++ b/doc/BRANCHES @@ -1,4 +1,4 @@ -# $NetBSD: BRANCHES,v 1.363 2021/08/09 00:32:51 thorpej Exp $ +# $NetBSD: BRANCHES,v 1.364 2021/08/09 20:49:08 andvar Exp $ # # This file contains a list of branches that exist in the NetBSD CVS # tree and their current state. @@ -824,7 +824,7 @@ Maintainer: Bill Stouder-Studenmund Scope: src, though all the interesting stuff is in the kernel Notes: This branch is intended to revive Scheduler Activations in -current in the 5.0 era. This branch's main goal is - to re-add syscall compatability so that SA-based libpthread + to re-add syscall compatibility so that SA-based libpthread programs can run with a -current kernel. 1:1 threading will remain the NetBSD-default. This branch will re-add necessary upcall support, and will also serve as a chance to clean diff --git a/doc/TODO.modules b/doc/TODO.modules index 822384f4e7b0..9d3823e28a8d 100644 --- a/doc/TODO.modules +++ b/doc/TODO.modules @@ -1,4 +1,4 @@ -/* $NetBSD: TODO.modules,v 1.23 2021/05/30 02:37:42 pgoyette Exp $ */ +/* $NetBSD: TODO.modules,v 1.24 2021/08/09 20:49:08 andvar Exp $ */ Some notes on the limitations of our current (as of 7.99.35) module subsystem. This list was triggered by an Email exchange between @@ -129,7 +129,7 @@ christos and pgoyette. kernel and its modules at /netbsd/kernel and /netbsd/modules/... Whatever new mechanism we arrive at will probably require changes to installation procedures and bootstrap code, and will need to handle - both the new and old mechanisms for compatability. + both the new and old mechanisms for compatibility. One additional option mentioned is to be able to specify, at boot loader time, an alternate value for the os-release portion of the diff --git a/include/netdb.h b/include/netdb.h index 9eac69551134..eff044037261 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -1,4 +1,4 @@ -/* $NetBSD: netdb.h,v 1.70 2020/06/04 11:21:16 nia Exp $ */ +/* $NetBSD: netdb.h,v 1.71 2021/08/09 20:49:08 andvar Exp $ */ /* * ++Copyright++ 1980, 1983, 1988, 1993 @@ -151,7 +151,7 @@ struct hostent { int h_addrtype; /*%< host address type */ int h_length; /*%< length of address */ char **h_addr_list; /*%< list of addresses from name server */ -#define h_addr h_addr_list[0] /*%< address, for backward compatiblity */ +#define h_addr h_addr_list[0] /*%< address, for backward compatibility */ }; /*% diff --git a/include/string.h b/include/string.h index f61004e30b2f..70d16dcc54ce 100644 --- a/include/string.h +++ b/include/string.h @@ -1,4 +1,4 @@ -/* $NetBSD: string.h,v 1.52 2018/02/20 02:35:24 kamil Exp $ */ +/* $NetBSD: string.h,v 1.53 2021/08/09 20:49:08 andvar Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -95,7 +95,7 @@ __aconst char *strsignal(int); __END_DECLS #if defined(_NETBSD_SOURCE) -#include /* for backwards-compatibilty */ +#include /* for backwards-compatibility */ __BEGIN_DECLS void *memmem(const void *, size_t, const void *, size_t); char *strcasestr(const char *, const char *); diff --git a/lib/libc/compat/arch/hppa/sys/compat_sigpending.S b/lib/libc/compat/arch/hppa/sys/compat_sigpending.S index fdb7994f0aad..59f7fd63e1b0 100644 --- a/lib/libc/compat/arch/hppa/sys/compat_sigpending.S +++ b/lib/libc/compat/arch/hppa/sys/compat_sigpending.S @@ -1,4 +1,4 @@ -/* $NetBSD: compat_sigpending.S,v 1.5 2020/05/05 20:43:47 skrll Exp $ */ +/* $NetBSD: compat_sigpending.S,v 1.6 2021/08/09 20:49:08 andvar Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ WARN_REFERENCES(sigpending, \ ENTRY(sigpending, 0) /* * AFAICT, since the hppa port came after __sigpending14, - * we shouldn't have to supply the compatability sigpending. + * we shouldn't have to supply the compatibility sigpending. */ b __cerror ldi EINVAL, %t1 diff --git a/lib/libc/compat/arch/hppa/sys/compat_sigprocmask.S b/lib/libc/compat/arch/hppa/sys/compat_sigprocmask.S index db0a13eee63d..a5cf8e865c1c 100644 --- a/lib/libc/compat/arch/hppa/sys/compat_sigprocmask.S +++ b/lib/libc/compat/arch/hppa/sys/compat_sigprocmask.S @@ -1,4 +1,4 @@ -/* $NetBSD: compat_sigprocmask.S,v 1.5 2020/05/05 20:43:47 skrll Exp $ */ +/* $NetBSD: compat_sigprocmask.S,v 1.6 2021/08/09 20:49:08 andvar Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ WARN_REFERENCES(sigprocmask, \ ENTRY(sigprocmask, 0) /* * AFAICT, since the hppa port came after __sigprocmask14, - * we shouldn't have to supply the compatability sigprocmask. + * we shouldn't have to supply the compatibility sigprocmask. */ b __cerror ldi EINVAL, %t1 diff --git a/lib/libc/compat/arch/hppa/sys/compat_sigreturn.S b/lib/libc/compat/arch/hppa/sys/compat_sigreturn.S index 62c7466cb327..2f12097ccc22 100644 --- a/lib/libc/compat/arch/hppa/sys/compat_sigreturn.S +++ b/lib/libc/compat/arch/hppa/sys/compat_sigreturn.S @@ -1,4 +1,4 @@ -/* $NetBSD: compat_sigreturn.S,v 1.5 2020/05/05 20:43:47 skrll Exp $ */ +/* $NetBSD: compat_sigreturn.S,v 1.6 2021/08/09 20:49:08 andvar Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ WARN_REFERENCES(sigreturn, \ ENTRY(sigreturn, 0) /* * AFAICT, since the hppa port came after __sigreturn14, - * we shouldn't have to supply the compatability sigreturn. + * we shouldn't have to supply the compatibility sigreturn. */ b __cerror ldi EINVAL, %t1 diff --git a/lib/libc/compat/arch/hppa/sys/compat_sigsuspend.S b/lib/libc/compat/arch/hppa/sys/compat_sigsuspend.S index 6cbe315ed0dc..74d7ab8dd534 100644 --- a/lib/libc/compat/arch/hppa/sys/compat_sigsuspend.S +++ b/lib/libc/compat/arch/hppa/sys/compat_sigsuspend.S @@ -1,4 +1,4 @@ -/* $NetBSD: compat_sigsuspend.S,v 1.5 2020/05/05 20:43:47 skrll Exp $ */ +/* $NetBSD: compat_sigsuspend.S,v 1.6 2021/08/09 20:49:08 andvar Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ WARN_REFERENCES(sigsuspend, \ ENTRY(sigsuspend, 0) /* * AFAICT, since the hppa port came after __sigsuspend14, - * we shouldn't have to supply the compatability sigsuspend. + * we shouldn't have to supply the compatibility sigsuspend. */ b __cerror ldi EINVAL, %t1 diff --git a/lib/libc/gen/isinfd_ieee754.c b/lib/libc/gen/isinfd_ieee754.c index 18899b740574..e9498031b0c8 100644 --- a/lib/libc/gen/isinfd_ieee754.c +++ b/lib/libc/gen/isinfd_ieee754.c @@ -1,4 +1,4 @@ -/* $NetBSD: isinfd_ieee754.c,v 1.1 2004/03/04 23:42:39 kleink Exp $ */ +/* $NetBSD: isinfd_ieee754.c,v 1.2 2021/08/09 20:49:09 andvar Exp $ */ /* * Copyright (c) 1992, 1993 @@ -40,14 +40,14 @@ #if 0 static char sccsid[] = "@(#)isinf.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: isinfd_ieee754.c,v 1.1 2004/03/04 23:42:39 kleink Exp $"); +__RCSID("$NetBSD: isinfd_ieee754.c,v 1.2 2021/08/09 20:49:09 andvar Exp $"); #endif #endif /* LIBC_SCCS and not lint */ #include #include -/* libc.so.12 ABI compatbility */ +/* libc.so.12 ABI compatibility */ #ifdef __weak_alias __weak_alias(isinf,__isinfd) #endif diff --git a/lib/libc/gen/isnand_ieee754.c b/lib/libc/gen/isnand_ieee754.c index 0ce4bd93679f..ce0b0df09019 100644 --- a/lib/libc/gen/isnand_ieee754.c +++ b/lib/libc/gen/isnand_ieee754.c @@ -1,4 +1,4 @@ -/* $NetBSD: isnand_ieee754.c,v 1.1 2004/03/04 23:42:39 kleink Exp $ */ +/* $NetBSD: isnand_ieee754.c,v 1.2 2021/08/09 20:49:09 andvar Exp $ */ /* * Copyright (c) 1992, 1993 @@ -40,14 +40,14 @@ #if 0 static char sccsid[] = "@(#)isinf.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: isnand_ieee754.c,v 1.1 2004/03/04 23:42:39 kleink Exp $"); +__RCSID("$NetBSD: isnand_ieee754.c,v 1.2 2021/08/09 20:49:09 andvar Exp $"); #endif #endif /* LIBC_SCCS and not lint */ #include #include -/* libc.so.12 ABI compatbility */ +/* libc.so.12 ABI compatibility */ #ifdef __weak_alias __weak_alias(isnan,__isnand) #endif diff --git a/sys/arch/sandpoint/stand/altboot/brdsetup.c b/sys/arch/sandpoint/stand/altboot/brdsetup.c index aefca1493ccd..f1f197af68c6 100644 --- a/sys/arch/sandpoint/stand/altboot/brdsetup.c +++ b/sys/arch/sandpoint/stand/altboot/brdsetup.c @@ -1,4 +1,4 @@ -/* $NetBSD: brdsetup.c,v 1.39 2017/08/03 19:22:15 phx Exp $ */ +/* $NetBSD: brdsetup.c,v 1.40 2021/08/09 20:49:09 andvar Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -513,7 +513,7 @@ encpcifix(struct brdprop *brd) #else /* * //// IDE fixup //// - * - "compatiblity mode" (ide 0x09) + * - "compatibility mode" (ide 0x09) * - remove PCI pin assignment (ide 0x3d) */ @@ -652,7 +652,7 @@ motpcifix(struct brdprop *brd) #else /* * //// IDE fixup -- case B //// - * - "compatiblity mode" (ide 0x09) + * - "compatibility mode" (ide 0x09) * - IDE primary/secondary interrupt routing (pcib 0x43) * - PCI interrupt routing (pcib 0x45/44) * - no PCI pin/line assignment (ide 0x3d/3c) diff --git a/sys/compat/common/Makefile.sysio b/sys/compat/common/Makefile.sysio index 8aab85632684..65c0948e69bb 100644 --- a/sys/compat/common/Makefile.sysio +++ b/sys/compat/common/Makefile.sysio @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.sysio,v 1.13 2020/01/27 17:09:17 pgoyette Exp $ +# $NetBSD: Makefile.sysio,v 1.14 2021/08/09 20:49:09 andvar Exp $ # Sources for syscall and ioctl compatibility across the versions. @@ -10,7 +10,7 @@ SRCS+= kern_exit_43.c kern_info_43.c kern_resource_43.c kern_sig_43.c \ SRCS+= kern_info_09.c SRCS+= compat_sysctl_09_43.c # for compat_43 or compat_09 -# Compatability code for NetBSD 1.0 +# Compatibility code for NetBSD 1.0 SRCS+= vfs_syscalls_10.c # Compatibility code for NetBSD 1.2 @@ -46,7 +46,7 @@ SRCS+= kern_sa_60.c tty_60.c kern_time_60.c kern_cpu_60.c ccd_60.c # Compatibility code for NetBSD 7.0 SRCS+= rtsock_70.c uipc_usrreq_70.c -# Compatability code for NetBSD 8.0 +# Compatibility code for NetBSD 8.0 SRCS+= kern_mod_80.c if_media_80.c # More compatibility code for NetBSD 5.0 diff --git a/sys/compat/common/files.common b/sys/compat/common/files.common index ef8d1d489e2d..82b4daec8fd2 100644 --- a/sys/compat/common/files.common +++ b/sys/compat/common/files.common @@ -1,4 +1,4 @@ -# $NetBSD: files.common,v 1.6 2020/01/21 02:37:16 pgoyette Exp $ +# $NetBSD: files.common,v 1.7 2021/08/09 20:49:09 andvar Exp $ # # Generic utility files, used by various compat options. @@ -28,7 +28,7 @@ file compat/common/compat_09_mod.c compat_09 file compat/common/kern_info_09.c compat_09 file compat/common/compat_sysctl_09_43.c compat_09 | compat_43 -# Compatability code for NetBSD 1.0 +# Compatibility code for NetBSD 1.0 file compat/common/compat_10_mod.c compat_10 file compat/common/vfs_syscalls_10.c compat_10 diff --git a/sys/ddb/db_command.h b/sys/ddb/db_command.h index 4b195653874e..6d1a5aea267b 100644 --- a/sys/ddb/db_command.h +++ b/sys/ddb/db_command.h @@ -1,4 +1,4 @@ -/* $NetBSD: db_command.h,v 1.41 2021/02/23 07:13:53 mrg Exp $ */ +/* $NetBSD: db_command.h,v 1.42 2021/08/09 20:49:09 andvar Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc. @@ -132,7 +132,7 @@ struct db_command { #define CS_OWN 0x1 /* non-standard syntax */ #define CS_MORE 0x2 /* standard syntax, but may have other words at end */ -#define CS_COMPAT 0x4 /* is set for compatibilty with old +#define CS_COMPAT 0x4 /* is set for compatibility with old ddb versions */ #define CS_SHOW 0x8 /* select show list */ #define CS_MACH 0x10 /* select machine dependent list */ diff --git a/sys/dev/acpi/acpi_util.c b/sys/dev/acpi/acpi_util.c index 88139b2b0e68..a17b2a4a00cc 100644 --- a/sys/dev/acpi/acpi_util.c +++ b/sys/dev/acpi/acpi_util.c @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_util.c,v 1.24 2021/02/05 17:12:43 thorpej Exp $ */ +/* $NetBSD: acpi_util.c,v 1.25 2021/08/09 20:49:09 andvar Exp $ */ /*- * Copyright (c) 2003, 2007, 2021 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_util.c,v 1.24 2021/02/05 17:12:43 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_util.c,v 1.25 2021/08/09 20:49:09 andvar Exp $"); #include #include @@ -435,7 +435,7 @@ acpi_compatible_free_strarray(const char **cpp, unsigned int count, * acpi_compatible_match -- * * Returns a weighted match value, comparing the _HID and _CID - * IDs against a driver's compatbility data. + * IDs against a driver's compatibility data. */ int acpi_compatible_match(const struct acpi_attach_args * const aa, diff --git a/sys/dev/gpio/gpio.c b/sys/dev/gpio/gpio.c index 947ad4a324f7..ce015ca3f76e 100644 --- a/sys/dev/gpio/gpio.c +++ b/sys/dev/gpio/gpio.c @@ -1,4 +1,4 @@ -/* $NetBSD: gpio.c,v 1.66 2021/08/07 16:19:10 thorpej Exp $ */ +/* $NetBSD: gpio.c,v 1.67 2021/08/09 20:49:09 andvar Exp $ */ /* $OpenBSD: gpio.c,v 1.6 2006/01/14 12:33:49 grange Exp $ */ /* @@ -19,7 +19,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.66 2021/08/07 16:19:10 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.67 2021/08/09 20:49:09 andvar Exp $"); /* * General Purpose Input/Output framework. @@ -812,7 +812,7 @@ gpio_ioctl(struct gpio_softc *sc, u_long cmd, void *data, int flag, /* * The double assignment to 'attach' in case of GPIOATTACH * and COMPAT_50 is on purpose. It ensures backward - * compatability in case we are called through the old + * compatibility in case we are called through the old * GPIOATTACH50 ioctl(2), which had not the ga_flags field * in struct gpio_attach. */ diff --git a/sys/dev/i2c/dbcool.c b/sys/dev/i2c/dbcool.c index b578fbfd7a79..d23fee635c04 100644 --- a/sys/dev/i2c/dbcool.c +++ b/sys/dev/i2c/dbcool.c @@ -1,4 +1,4 @@ -/* $NetBSD: dbcool.c,v 1.62 2021/06/21 03:12:54 christos Exp $ */ +/* $NetBSD: dbcool.c,v 1.63 2021/08/09 20:49:09 andvar Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.62 2021/06/21 03:12:54 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.63 2021/08/09 20:49:09 andvar Exp $"); #include #include @@ -1501,7 +1501,7 @@ dbcool_setup(device_t self) /* * Some chips are capable of reporting an extended temperature range * by default. On these models, config register 5 bit 0 can be set - * to 1 for compatability with other chips that report 2s complement. + * to 1 for compatibility with other chips that report 2s complement. */ if (sc->sc_dc.dc_chip->flags & DBCFLAG_ADT7466) { if (sc->sc_dc.dc_readreg(&sc->sc_dc, DBCOOL_ADT7466_CONFIG1) & 0x80) diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c index aff3688a78d8..aa6dc36d484e 100644 --- a/sys/dev/ic/ath.c +++ b/sys/dev/ic/ath.c @@ -1,4 +1,4 @@ -/* $NetBSD: ath.c,v 1.135 2021/06/12 12:15:54 riastradh Exp $ */ +/* $NetBSD: ath.c,v 1.136 2021/08/09 20:49:10 andvar Exp $ */ /*- * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $"); #endif #ifdef __NetBSD__ -__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.135 2021/06/12 12:15:54 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.136 2021/08/09 20:49:10 andvar Exp $"); #endif /* @@ -5307,7 +5307,7 @@ ath_watchdog(struct ifnet *ifp) * Diagnostic interface to the HAL. This is used by various * tools to do things like retrieve register contents for * debugging. The mechanism is intentionally opaque so that - * it can change frequently w/o concern for compatiblity. + * it can change frequently w/o concern for compatibility. */ static int ath_ioctl_diag(struct ath_softc *sc, struct ath_diag *ad) diff --git a/sys/dev/ic/dp8390var.h b/sys/dev/ic/dp8390var.h index f6cf0b494111..ee2ac60e2f05 100644 --- a/sys/dev/ic/dp8390var.h +++ b/sys/dev/ic/dp8390var.h @@ -1,4 +1,4 @@ -/* $NetBSD: dp8390var.h,v 1.35 2021/06/30 20:00:18 thorpej Exp $ */ +/* $NetBSD: dp8390var.h,v 1.36 2021/08/09 20:49:10 andvar Exp $ */ /* * Device driver for National Semiconductor DS8390/WD83C690 based ethernet @@ -34,7 +34,7 @@ struct dp8390_softc { struct ethercom sc_ec; /* ethernet common */ struct mii_data sc_mii; /* MII glue */ -#define sc_media sc_mii.mii_media /* compatibilty definition */ +#define sc_media sc_mii.mii_media /* compatibility definition */ callout_t sc_tick_ch; /* MII tick callout */ bus_space_tag_t sc_regt; /* NIC register space tag */ diff --git a/sys/dev/ic/sl811hs.c b/sys/dev/ic/sl811hs.c index a45f307ec4ad..053fb2bb1266 100644 --- a/sys/dev/ic/sl811hs.c +++ b/sys/dev/ic/sl811hs.c @@ -1,4 +1,4 @@ -/* $NetBSD: sl811hs.c,v 1.106 2021/08/07 16:19:12 thorpej Exp $ */ +/* $NetBSD: sl811hs.c,v 1.107 2021/08/09 20:49:10 andvar Exp $ */ /* * Not (c) 2007 Matthew Orgass @@ -68,7 +68,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.106 2021/08/07 16:19:12 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.107 2021/08/09 20:49:10 andvar Exp $"); #ifdef _KERNEL_OPT #include "opt_slhci.h" @@ -2859,7 +2859,7 @@ slhci_reset(struct slhci_softc *sc) /* * Initialize B registers. This can't be done earlier since * they are not valid until the SL811_CSOF register is written - * above due to SL11H compatability. + * above due to SL11H compatibility. */ slhci_write(sc, SL11_E1ADDR, SL11_BUFFER_END - 8); slhci_write(sc, SL11_E1LEN, 0); diff --git a/sys/kern/compat_stub.c b/sys/kern/compat_stub.c index 7ffe6bd8d53f..01345b696a08 100644 --- a/sys/kern/compat_stub.c +++ b/sys/kern/compat_stub.c @@ -1,4 +1,4 @@ -/* $NetBSD: compat_stub.c,v 1.21 2020/11/01 18:51:02 pgoyette Exp $ */ +/* $NetBSD: compat_stub.c,v 1.22 2021/08/09 20:49:10 andvar Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -75,83 +75,83 @@ void (*vec_sctp_delete_ip_address)(struct ifaddr *) = NULL; /* - * usb device_info compatability + * usb device_info compatibility */ struct usb_subr_fill_30_hook_t usb_subr_fill_30_hook; struct usb_subr_copy_30_hook_t usb_subr_copy_30_hook; /* - * ccd device compatability ioctl + * ccd device compatibility ioctl */ struct ccd_ioctl_60_hook_t ccd_ioctl_60_hook; /* - * clockctl device compatability ioctl + * clockctl device compatibility ioctl */ struct clockctl_ioctl_50_hook_t clockctl_ioctl_50_hook; /* - * if_sppp device compatability ioctl subroutine + * if_sppp device compatibility ioctl subroutine */ struct sppp_params_50_hook_t sppp_params_50_hook; /* - * cryptodev compatability ioctl + * cryptodev compatibility ioctl */ struct ocryptof_50_hook_t ocryptof_50_hook; /* - * raidframe compatability + * raidframe compatibility */ struct raidframe_ioctl_50_hook_t raidframe_ioctl_50_hook; struct raidframe_ioctl_80_hook_t raidframe_ioctl_80_hook; struct raidframe_netbsd32_ioctl_hook_t raidframe_netbsd32_ioctl_hook; /* - * puffs compatability + * puffs compatibility */ struct puffs_out_50_hook_t puffs_out_50_hook; struct puffs_in_50_hook_t puffs_in_50_hook; /* - * wsevents compatability + * wsevents compatibility */ struct wscons_copyout_events_50_hook_t wscons_copyout_events_50_hook; /* - * sysmon_power compatability + * sysmon_power compatibility */ struct compat_sysmon_power_40_hook_t compat_sysmon_power_40_hook; /* - * compat_bio compatability + * compat_bio compatibility */ struct compat_bio_30_hook_t compat_bio_30_hook; /* - * vnd ioctl compatability + * vnd ioctl compatibility */ struct compat_vndioctl_30_hook_t compat_vndioctl_30_hook; struct compat_vndioctl_50_hook_t compat_vndioctl_50_hook; /* - * ieee80211 ioctl compatability + * ieee80211 ioctl compatibility */ struct ieee80211_ioctl_20_hook_t ieee80211_ioctl_20_hook; /* - * if_43 compatability + * if_43 compatibility */ struct if_cvtcmd_43_hook_t if_cvtcmd_43_hook; struct if_ifioctl_43_hook_t if_ifioctl_43_hook; /* - * if43_cvtcmd_20 compatability + * if43_cvtcmd_20 compatibility */ struct if43_cvtcmd_20_hook_t if43_cvtcmd_20_hook; @@ -173,18 +173,18 @@ struct uipc_socket_50_getopt1_hook_t uipc_socket_50_getopt1_hook; struct uipc_socket_50_sbts_hook_t uipc_socket_50_sbts_hook; /* - * uipc_syscalls_50 compatability + * uipc_syscalls_50 compatibility */ struct uipc_syscalls_50_hook_t uipc_syscalls_50_hook; /* - * rtsock 14 compatability + * rtsock 14 compatibility */ struct rtsock_oifmsg_14_hook_t rtsock_oifmsg_14_hook; struct rtsock_iflist_14_hook_t rtsock_iflist_14_hook; /* - * rtsock 50 compatability + * rtsock 50 compatibility */ struct rtsock_iflist_50_hook_t rtsock_iflist_50_hook; struct rtsock_oifmsg_50_hook_t rtsock_oifmsg_50_hook; @@ -197,7 +197,7 @@ struct rtsock_rt_addrmsg_50_hook_t rtsock_rt_addrmsg_50_hook; struct rtsock_rt_ieee80211msg_50_hook_t rtsock_rt_ieee80211msg_50_hook; /* - * rtsock 70 compatability + * rtsock 70 compatibility */ struct rtsock_newaddr_70_hook_t rtsock_newaddr_70_hook; struct rtsock_iflist_70_hook_t rtsock_iflist_70_hook; @@ -252,7 +252,7 @@ struct uipc_unp_70_hook_t uipc_unp_70_hook; struct sysvipc_sysctl_50_hook_t sysvipc_sysctl_50_hook; /* - * ifmedia_80 compatability + * ifmedia_80 compatibility */ struct ifmedia_80_pre_hook_t ifmedia_80_pre_hook; struct ifmedia_80_post_hook_t ifmedia_80_post_hook; diff --git a/sys/kern/sys_ptrace_common.c b/sys/kern/sys_ptrace_common.c index 0c8a8d0f21b8..8b87f9e97966 100644 --- a/sys/kern/sys_ptrace_common.c +++ b/sys/kern/sys_ptrace_common.c @@ -1,4 +1,4 @@ -/* $NetBSD: sys_ptrace_common.c,v 1.91 2020/11/04 19:27:41 pgoyette Exp $ */ +/* $NetBSD: sys_ptrace_common.c,v 1.92 2021/08/09 20:49:10 andvar Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -107,7 +107,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.91 2020/11/04 19:27:41 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.92 2021/08/09 20:49:10 andvar Exp $"); #ifdef _KERNEL_OPT #include "opt_ptrace.h" @@ -1146,7 +1146,7 @@ do_ptrace(struct ptrace_methods *ptm, struct lwp *l, int req, pid_t pid, * but was extended to two 16-bit (2 x 64kb) address spaces. * * We no longer maintain this feature in maintained architectures, but - * we keep the API for backward compatiblity. Currently the I and D + * we keep the API for backward compatibility. Currently the I and D * operations are exactly the same and not distinguished in debuggers. */ case PT_WRITE_I: diff --git a/sys/kern/tty_conf.c b/sys/kern/tty_conf.c index d49972339799..4bf113d801f6 100644 --- a/sys/kern/tty_conf.c +++ b/sys/kern/tty_conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: tty_conf.c,v 1.56 2014/05/22 16:28:06 dholland Exp $ */ +/* $NetBSD: tty_conf.c,v 1.57 2021/08/09 20:49:10 andvar Exp $ */ /*- * Copyright (c) 2005, 2007 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tty_conf.c,v 1.56 2014/05/22 16:28:06 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tty_conf.c,v 1.57 2021/08/09 20:49:10 andvar Exp $"); #define TTY_ALLOW_PRIVATE @@ -94,7 +94,7 @@ static struct linesw termios_disc = { }; /* - * This is for the benefit of old BSD TTY compatbility, but since it is + * This is for the benefit of old BSD TTY compatibility, but since it is * identical to termios (except for the name), don't bother conditionalizing * it. */ diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 14669955d472..511cbe3264e6 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.250 2021/05/17 04:07:43 yamaguchi Exp $ +# $NetBSD: Makefile,v 1.251 2021/08/09 20:49:10 andvar Exp $ .include # For all platforms -# Modules for compatability with earlier versions of NetBSD +# Modules for compatibility with earlier versions of NetBSD SUBDIR+= compat_util SUBDIR+= compat_43 compat_sysctl_09_43 diff --git a/sys/net/if.h b/sys/net/if.h index c5bd15db3fdb..985f5cb851ca 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -1,4 +1,4 @@ -/* $NetBSD: if.h,v 1.291 2021/06/29 21:19:58 riastradh Exp $ */ +/* $NetBSD: if.h,v 1.292 2021/08/09 20:49:10 andvar Exp $ */ /*- * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -762,7 +762,7 @@ struct ifaddr { /* * Message format for use in obtaining information about interfaces from * sysctl and the routing socket. We need to force 64-bit alignment if we - * aren't using compatiblity definitons. + * aren't using compatibility definitions. */ #if !defined(_KERNEL) || !defined(COMPAT_RTSOCK) #define __align64 __aligned(sizeof(uint64_t)) diff --git a/sys/net/route.h b/sys/net/route.h index 143e4f427d9d..b5b764a37600 100644 --- a/sys/net/route.h +++ b/sys/net/route.h @@ -1,4 +1,4 @@ -/* $NetBSD: route.h,v 1.128 2021/03/22 18:40:18 christos Exp $ */ +/* $NetBSD: route.h,v 1.129 2021/08/09 20:49:10 andvar Exp $ */ /* * Copyright (c) 1980, 1986, 1993 @@ -207,7 +207,7 @@ struct rtstat { #if !defined(_KERNEL) || !defined(COMPAT_RTSOCK) /* - * If we aren't being compiled for backwards compatiblity, enforce 64-bit + * If we aren't being compiled for backwards compatibility, enforce 64-bit * alignment so any routing message is the same regardless if the kernel * is an ILP32 or LP64 kernel. */ diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h index aa9911be2dbc..e6ae399bc3d4 100644 --- a/sys/netinet/sctp_pcb.h +++ b/sys/netinet/sctp_pcb.h @@ -1,5 +1,5 @@ /* $KAME: sctp_pcb.h,v 1.21 2005/07/16 01:18:47 suz Exp $ */ -/* $NetBSD: sctp_pcb.h,v 1.3 2020/01/19 20:51:13 riastradh Exp $ */ +/* $NetBSD: sctp_pcb.h,v 1.4 2021/08/09 20:49:10 andvar Exp $ */ #ifndef __SCTP_PCB_H__ #define __SCTP_PCB_H__ @@ -283,7 +283,7 @@ struct sctp_socket_q_list { struct sctp_inpcb { /* * put an inpcb in front of it all, kind of a waste but we need - * to for compatability with all the other stuff. + * to for compatibility with all the other stuff. */ union { struct inpcb inp; diff --git a/sys/netipsec/key.h b/sys/netipsec/key.h index 6417eae586c1..d54f0391a43a 100644 --- a/sys/netipsec/key.h +++ b/sys/netipsec/key.h @@ -1,4 +1,4 @@ -/* $NetBSD: key.h,v 1.36 2018/04/19 08:27:38 maxv Exp $ */ +/* $NetBSD: key.h,v 1.37 2021/08/09 20:49:10 andvar Exp $ */ /* $FreeBSD: key.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */ /* $KAME: key.h,v 1.21 2001/07/27 03:51:30 itojun Exp $ */ @@ -61,7 +61,7 @@ struct secpolicy *key_newsp(const char*, int); struct secpolicy *key_gettunnel(const struct sockaddr *, const struct sockaddr *, const struct sockaddr *, const struct sockaddr *, const char *, int); -/* NB: prepend with _ for KAME IPv6 compatbility */ +/* NB: prepend with _ for KAME IPv6 compatibility */ void key_init_sp(struct secpolicy *); void key_free_sp(struct secpolicy *); u_int key_sp_refcnt(const struct secpolicy *); diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c index 8a249c967ea2..2756c858db70 100644 --- a/usr.bin/find/option.c +++ b/usr.bin/find/option.c @@ -1,4 +1,4 @@ -/* $NetBSD: option.c,v 1.28 2020/11/01 05:38:29 mrg Exp $ */ +/* $NetBSD: option.c,v 1.29 2021/08/09 20:49:10 andvar Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "from: @(#)option.c 8.2 (Berkeley) 4/16/94"; #else -__RCSID("$NetBSD: option.c,v 1.28 2020/11/01 05:38:29 mrg Exp $"); +__RCSID("$NetBSD: option.c,v 1.29 2021/08/09 20:49:10 andvar Exp $"); #endif #endif /* not lint */ @@ -94,7 +94,7 @@ static OPTION const options[] = { { "-name", N_NAME, c_name, 1 }, { "-newer", N_NEWER, c_newer, 1 }, -/* Aliases for compatability with Gnu findutils */ +/* Aliases for compatibility with Gnu findutils */ { "-neweraa", N_ANEWER, c_anewer, 1 }, { "-newerat", N_ASINCE, c_asince, 1 }, { "-newercc", N_CNEWER, c_cnewer, 1 }, @@ -126,7 +126,7 @@ static OPTION const options[] = { */ { "-nogroup", N_NOGROUP, c_nogroup, 0 }, -/* Alias for compatability with Gnu findutils */ +/* Alias for compatibility with Gnu findutils */ { "-not", N_NOT, c_not, 0 }, { "-nouser", N_NOUSER, c_nouser, 0 }, { "-o", N_OR, c_or, 0 }, diff --git a/usr.sbin/rpc.pcnfsd/README b/usr.sbin/rpc.pcnfsd/README index eda37fb1f87e..3ec9d5873172 100644 --- a/usr.sbin/rpc.pcnfsd/README +++ b/usr.sbin/rpc.pcnfsd/README @@ -1,4 +1,4 @@ -# $NetBSD: README,v 1.3 2003/11/12 13:31:07 grant Exp $ +# $NetBSD: README,v 1.4 2021/08/09 20:49:11 andvar Exp $ July 1995 - Ported to NetBSD by Gordon Ross @@ -47,7 +47,7 @@ or porting this should watch for the following: - Since some commands (especially lpq) can hang up forever if, say, the host of a remote printer is down, the su_popen mechanism now includes a watchdog timer. I HAVE NOT HAD A CHANCE TO TEST THIS - LOGIC ON SVR4 YET! The code was derived from the System V compatiility + LOGIC ON SVR4 YET! The code was derived from the System V compatibility section of the AnswerBook, so it _should_ be OK, but I can't wait to test it before posting this. - I've mades lots of lint-suggested improvements. It doesn't lint