Module Name: src
Committed By: andvar
Date: Thu Feb 8 20:11:56 UTC 2024
Modified Files:
src/share/man/man7: sticky.7
src/sys/arch/algor/pci: pcib.c
src/sys/arch/evbmips/malta/pci: pcib.c
src/sys/arch/m68k/include: intr.h mmu_51.h
src/sys/dev/ic: aic79xxvar.h aic7xxxvar.h
src/sys/dev/mii: mii.c
src/usr.bin/elf2ecoff: elf2ecoff.c
Log Message:
s/sharable/shareable in comments and documentation.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/share/man/man7/sticky.7
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/algor/pci/pcib.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbmips/malta/pci/pcib.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/m68k/include/intr.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/m68k/include/mmu_51.h
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ic/aic79xxvar.h
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/ic/aic7xxxvar.h
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/mii/mii.c
cvs rdiff -u -r1.34 -r1.35 src/usr.bin/elf2ecoff/elf2ecoff.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man7/sticky.7
diff -u src/share/man/man7/sticky.7:1.6 src/share/man/man7/sticky.7:1.7
--- src/share/man/man7/sticky.7:1.6 Tue May 10 17:00:44 2011
+++ src/share/man/man7/sticky.7 Thu Feb 8 20:11:55 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: sticky.7,v 1.6 2011/05/10 17:00:44 jruoho Exp $
+.\" $NetBSD: sticky.7,v 1.7 2024/02/08 20:11:55 andvar Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -73,10 +73,10 @@ for details about modifying file modes.
.Sh HISTORY
The sticky bit first appeared in V7, and this manual page appeared
in section 8.
-Its initial use was to mark sharable executables
+Its initial use was to mark shareable executables
that were frequently used so that they would stay in swap after
the process exited.
-Sharable executables were compiled in a special way so their text
+Shareable executables were compiled in a special way so their text
and read-only data could be shared amongst processes.
.Xr vi 1
and
Index: src/sys/arch/algor/pci/pcib.c
diff -u src/sys/arch/algor/pci/pcib.c:1.28 src/sys/arch/algor/pci/pcib.c:1.29
--- src/sys/arch/algor/pci/pcib.c:1.28 Sat Aug 7 16:18:40 2021
+++ src/sys/arch/algor/pci/pcib.c Thu Feb 8 20:11:55 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.28 2021/08/07 16:18:40 thorpej Exp $ */
+/* $NetBSD: pcib.c,v 1.29 2024/02/08 20:11:55 andvar Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.28 2021/08/07 16:18:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.29 2024/02/08 20:11:55 andvar Exp $");
#include "opt_algor_p5064.h"
#include "opt_algor_p6032.h"
@@ -540,7 +540,7 @@ pcib_isa_intr_alloc(void *v, int mask, i
if (type != sc->sc_intrtab[i].intr_type)
continue;
/*
- * If the IRQ is sharable, count the number of
+ * If the IRQ is shareable, count the number of
* other handlers, and if it's smaller than the
* last IRQ like this, remember it.
*/
@@ -555,7 +555,7 @@ pcib_isa_intr_alloc(void *v, int mask, i
break;
case IST_PULSE:
- /* This just isn't sharable. */
+ /* This just isn't shareable. */
continue;
}
}
Index: src/sys/arch/evbmips/malta/pci/pcib.c
diff -u src/sys/arch/evbmips/malta/pci/pcib.c:1.24 src/sys/arch/evbmips/malta/pci/pcib.c:1.25
--- src/sys/arch/evbmips/malta/pci/pcib.c:1.24 Sat Jan 22 15:10:31 2022
+++ src/sys/arch/evbmips/malta/pci/pcib.c Thu Feb 8 20:11:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.24 2022/01/22 15:10:31 skrll Exp $ */
+/* $NetBSD: pcib.c,v 1.25 2024/02/08 20:11:56 andvar Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.24 2022/01/22 15:10:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.25 2024/02/08 20:11:56 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -585,7 +585,7 @@ pcib_isa_intr_alloc(void *v, int mask, i
if (type != my_sc->sc_intrtab[i].intr_type)
continue;
/*
- * If the IRQ is sharable, count the number of
+ * If the IRQ is shareable, count the number of
* other handlers, and if it's smaller than the
* last IRQ like this, remember it.
*/
@@ -600,7 +600,7 @@ pcib_isa_intr_alloc(void *v, int mask, i
break;
case IST_PULSE:
- /* This just isn't sharable. */
+ /* This just isn't shareable. */
continue;
}
}
Index: src/sys/arch/m68k/include/intr.h
diff -u src/sys/arch/m68k/include/intr.h:1.8 src/sys/arch/m68k/include/intr.h:1.9
--- src/sys/arch/m68k/include/intr.h:1.8 Fri Jan 19 20:55:42 2024
+++ src/sys/arch/m68k/include/intr.h Thu Feb 8 20:11:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.8 2024/01/19 20:55:42 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.9 2024/02/08 20:11:56 andvar Exp $ */
/*-
* Copyright (c) 2023, 2024 The NetBSD Foundation, Inc.
@@ -178,7 +178,7 @@ do { \
* m68k interrupt priroity level (this is NOT an IPL_* value). Otherwise.
* the handler is registered at the specified vector.
*
- * Vectored interrupts are not sharable. The interrupt vector must be
+ * Vectored interrupts are not shareable. The interrupt vector must be
* within the platform's "user vector" region, which is generally defined
* as vectors 64-255, although some platforms may use vectors that start
* below 64 (in which case, that platform must define MACHINE_USERVEC_START
Index: src/sys/arch/m68k/include/mmu_51.h
diff -u src/sys/arch/m68k/include/mmu_51.h:1.3 src/sys/arch/m68k/include/mmu_51.h:1.4
--- src/sys/arch/m68k/include/mmu_51.h:1.3 Tue Jan 9 07:28:26 2024
+++ src/sys/arch/m68k/include/mmu_51.h Thu Feb 8 20:11:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mmu_51.h,v 1.3 2024/01/09 07:28:26 thorpej Exp $ */
+/* $NetBSD: mmu_51.h,v 1.4 2024/02/08 20:11:56 andvar Exp $ */
/*-
* Copyright (c) 1997, 2023 The NetBSD Foundation, Inc.
@@ -260,7 +260,7 @@ struct mmu51_rootptr {
#define PSR51_I __BIT(10) /* Invalid */
#define PSR51_M __BIT(9) /* Modified */
#define PSR51_G __BIT(8) /* Gate */
-#define PSR51_C __BIT(7) /* Globally Sharable */
+#define PSR51_C __BIT(7) /* Globally Shareable */
#define PSR51_N __BITS(0,2) /* Number of levels */
#ifdef _KERNEL
Index: src/sys/dev/ic/aic79xxvar.h
diff -u src/sys/dev/ic/aic79xxvar.h:1.29 src/sys/dev/ic/aic79xxvar.h:1.30
--- src/sys/dev/ic/aic79xxvar.h:1.29 Fri Oct 15 22:32:28 2021
+++ src/sys/dev/ic/aic79xxvar.h Thu Feb 8 20:11:56 2024
@@ -1,7 +1,7 @@
-/* $NetBSD: aic79xxvar.h,v 1.29 2021/10/15 22:32:28 andvar Exp $ */
+/* $NetBSD: aic79xxvar.h,v 1.30 2024/02/08 20:11:56 andvar Exp $ */
/*
- * Core definitions and data structures sharable across OS platforms.
+ * Core definitions and data structures shareable across OS platforms.
*
* Copyright (c) 1994-2002 Justin T. Gibbs.
* Copyright (c) 2000-2002 Adaptec Inc.
Index: src/sys/dev/ic/aic7xxxvar.h
diff -u src/sys/dev/ic/aic7xxxvar.h:1.58 src/sys/dev/ic/aic7xxxvar.h:1.59
--- src/sys/dev/ic/aic7xxxvar.h:1.58 Sun Aug 22 19:56:15 2021
+++ src/sys/dev/ic/aic7xxxvar.h Thu Feb 8 20:11:56 2024
@@ -1,7 +1,7 @@
-/* $NetBSD: aic7xxxvar.h,v 1.58 2021/08/22 19:56:15 andvar Exp $ */
+/* $NetBSD: aic7xxxvar.h,v 1.59 2024/02/08 20:11:56 andvar Exp $ */
/*
- * Core definitions and data structures sharable across OS platforms.
+ * Core definitions and data structures shareable across OS platforms.
*
* Copyright (c) 1994-2001 Justin T. Gibbs.
* Copyright (c) 2000-2001 Adaptec Inc.
@@ -39,7 +39,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: aic7xxxvar.h,v 1.58 2021/08/22 19:56:15 andvar Exp $
+ * $Id: aic7xxxvar.h,v 1.59 2024/02/08 20:11:56 andvar Exp $
*
* $FreeBSD: /repoman/r/ncvs/src/sys/dev/aic7xxx/aic7xxx.h,v 1.44 2003/01/20 20:44:55 gibbs Exp $
*/
Index: src/sys/dev/mii/mii.c
diff -u src/sys/dev/mii/mii.c:1.58 src/sys/dev/mii/mii.c:1.59
--- src/sys/dev/mii/mii.c:1.58 Sun Aug 14 20:34:26 2022
+++ src/sys/dev/mii/mii.c Thu Feb 8 20:11:55 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mii.c,v 1.58 2022/08/14 20:34:26 riastradh Exp $ */
+/* $NetBSD: mii.c,v 1.59 2024/02/08 20:11:55 andvar Exp $ */
/*-
* Copyright (c) 1998, 2000, 2020 The NetBSD Foundation, Inc.
@@ -31,12 +31,12 @@
*/
/*
- * MII bus layer, glues MII-capable network interface drivers to sharable
+ * MII bus layer, glues MII-capable network interface drivers to shareable
* PHY drivers.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mii.c,v 1.58 2022/08/14 20:34:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mii.c,v 1.59 2024/02/08 20:11:55 andvar Exp $");
#define __IFMEDIA_PRIVATE
Index: src/usr.bin/elf2ecoff/elf2ecoff.c
diff -u src/usr.bin/elf2ecoff/elf2ecoff.c:1.34 src/usr.bin/elf2ecoff/elf2ecoff.c:1.35
--- src/usr.bin/elf2ecoff/elf2ecoff.c:1.34 Mon Mar 6 21:39:06 2023
+++ src/usr.bin/elf2ecoff/elf2ecoff.c Thu Feb 8 20:11:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: elf2ecoff.c,v 1.34 2023/03/06 21:39:06 andvar Exp $ */
+/* $NetBSD: elf2ecoff.c,v 1.35 2024/02/08 20:11:56 andvar Exp $ */
/*
* Copyright (c) 1997 Jonathan Stone
@@ -314,7 +314,7 @@ usage:
ep.f.f_symptr = 0;
ep.f.f_nsyms = sizeof(struct ecoff32_symhdr);
ep.f.f_opthdr = sizeof ep.a;
- ep.f.f_flags = 0x100f; /* Stripped, not sharable. */
+ ep.f.f_flags = 0x100f; /* Stripped, not shareable. */
memset(esecs, 0, sizeof(esecs));
