Module Name: src
Committed By: msaitoh
Date: Fri Dec 27 09:32:10 UTC 2019
Modified Files:
src/sys/arch/mac68k/dev: if_mc.c
src/sys/arch/macppc/dev: am79c950.c
src/sys/dev/ic: lance.c
src/sys/dev/marvell: gtpcireg.h mvpexreg.h
src/usr.bin/vgrind: regexp.c
Log Message:
s/expresion/expression/ in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/mac68k/dev/if_mc.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/macppc/dev/am79c950.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/ic/lance.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/marvell/gtpcireg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/marvell/mvpexreg.h
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/vgrind/regexp.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/if_mc.c
diff -u src/sys/arch/mac68k/dev/if_mc.c:1.51 src/sys/arch/mac68k/dev/if_mc.c:1.52
--- src/sys/arch/mac68k/dev/if_mc.c:1.51 Tue May 28 07:41:46 2019
+++ src/sys/arch/mac68k/dev/if_mc.c Fri Dec 27 09:32:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mc.c,v 1.51 2019/05/28 07:41:46 msaitoh Exp $ */
+/* $NetBSD: if_mc.c,v 1.52 2019/12/27 09:32:09 msaitoh Exp $ */
/*-
* Copyright (c) 1997 David Huang <[email protected]>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.51 2019/05/28 07:41:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.52 2019/12/27 09:32:09 msaitoh Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -117,7 +117,7 @@ ether_cmp(void *one, void *two)
diff |= *a++ - *b++;
#else
/*
- * Most modern CPUs do better with a single expresion.
+ * Most modern CPUs do better with a single expression.
* Note that short-cut evaluation is NOT helpful here,
* because it just makes the code longer, not faster!
*/
Index: src/sys/arch/macppc/dev/am79c950.c
diff -u src/sys/arch/macppc/dev/am79c950.c:1.46 src/sys/arch/macppc/dev/am79c950.c:1.47
--- src/sys/arch/macppc/dev/am79c950.c:1.46 Wed May 29 10:07:28 2019
+++ src/sys/arch/macppc/dev/am79c950.c Fri Dec 27 09:32:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: am79c950.c,v 1.46 2019/05/29 10:07:28 msaitoh Exp $ */
+/* $NetBSD: am79c950.c,v 1.47 2019/12/27 09:32:10 msaitoh Exp $ */
/*-
* Copyright (c) 1997 David Huang <[email protected]>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.46 2019/05/29 10:07:28 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.47 2019/12/27 09:32:10 msaitoh Exp $");
#include "opt_inet.h"
@@ -116,7 +116,7 @@ ether_cmp(void *one, void *two)
diff |= *a++ - *b++;
#else
/*
- * Most modern CPUs do better with a single expresion.
+ * Most modern CPUs do better with a single expression.
* Note that short-cut evaluation is NOT helpful here,
* because it just makes the code longer, not faster!
*/
Index: src/sys/dev/ic/lance.c
diff -u src/sys/dev/ic/lance.c:1.58 src/sys/dev/ic/lance.c:1.59
--- src/sys/dev/ic/lance.c:1.58 Wed May 29 10:07:29 2019
+++ src/sys/dev/ic/lance.c Fri Dec 27 09:32:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lance.c,v 1.58 2019/05/29 10:07:29 msaitoh Exp $ */
+/* $NetBSD: lance.c,v 1.59 2019/12/27 09:32:10 msaitoh Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.58 2019/05/29 10:07:29 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.59 2019/12/27 09:32:10 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -144,7 +144,7 @@ ether_cmp(void *one, void *two)
diff |= *a++ - *b++;
#else
/*
- * Most modern CPUs do better with a single expresion.
+ * Most modern CPUs do better with a single expression.
* Note that short-cut evaluation is NOT helpful here,
* because it just makes the code longer, not faster!
*/
Index: src/sys/dev/marvell/gtpcireg.h
diff -u src/sys/dev/marvell/gtpcireg.h:1.6 src/sys/dev/marvell/gtpcireg.h:1.7
--- src/sys/dev/marvell/gtpcireg.h:1.6 Wed Jun 2 06:02:20 2010
+++ src/sys/dev/marvell/gtpcireg.h Fri Dec 27 09:32:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gtpcireg.h,v 1.6 2010/06/02 06:02:20 kiyohara Exp $ */
+/* $NetBSD: gtpcireg.h,v 1.7 2019/12/27 09:32:10 msaitoh Exp $ */
/*
* Copyright (c) 2008, 2009 KIYOHARA Takashi
* All rights reserved.
@@ -78,7 +78,7 @@
#define GTPCI_P2PM0BARL(p) (0x0d5c | ((p) << 7)) /* P2P Mem0 (Low) */
#define GTPCI_P2PM0BARH(p) (0x0d60 | ((p) << 7)) /* P2P Mem0 (High) */
#define GTPCI_P2PIOBAR(p) (0x0d6c | ((p) << 7)) /* P2P I/O */
-#define GTPCI_EROMBAR(p) (0x0f38 | ((p) << 7)) /* Expresion ROM */
+#define GTPCI_EROMBAR(p) (0x0f38 | ((p) << 7)) /* Expression ROM */
#define GTPCI_DRAMBARBS(p) (0x0c1c | ((p) << 7)) /*DRAM BAR Bank Select*/
#define GTPCI_ADC(p) (0x0d3c | ((p) << 7)) /* Addr Decode Ctrl */
#define GTPCI_ADC_REMAPWRDIS (1 << 0)
Index: src/sys/dev/marvell/mvpexreg.h
diff -u src/sys/dev/marvell/mvpexreg.h:1.2 src/sys/dev/marvell/mvpexreg.h:1.3
--- src/sys/dev/marvell/mvpexreg.h:1.2 Sat Aug 8 14:35:06 2015
+++ src/sys/dev/marvell/mvpexreg.h Fri Dec 27 09:32:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mvpexreg.h,v 1.2 2015/08/08 14:35:06 kiyohara Exp $ */
+/* $NetBSD: mvpexreg.h,v 1.3 2019/12/27 09:32:10 msaitoh Exp $ */
/*
* Copyright (c) 2008, 2009 KIYOHARA Takashi
* All rights reserved.
@@ -41,7 +41,7 @@
#define MVPEX_BARC_BAREN (1 << 0)
#define MVPEX_BARC_BARSIZE_MASK 0xffff0000
#define MVPEX_BARC_BARSIZE(s) (((s) - 1) & MVPEX_BARC_BARSIZE_MASK)
-#define MVPEX_ERBARC 0x180c /* Expresion ROM BAR Control */
+#define MVPEX_ERBARC 0x180c /* Expression ROM BAR Control */
#define MVPEX_ERBARC_EXPROMEN (1 << 0)
#define MVPEX_ERBARC_EXPROMSZ_05M (0 << 19)
#define MVPEX_ERBARC_EXPROMSZ_1M (1 << 19)
@@ -87,8 +87,8 @@
#define MVPEX_WR_REMAP_REMAPEN (1 << 0)
#define MVPEX_WR_REMAP(a) ((a) & 0xffff0000)
#define MVPEX_DWC 0x18b0 /* Default Window Control */
-#define MVPEX_EROMWC 0x18c0 /* Expresion ROM Win Control */
-#define MVPEX_EROMWR 0x18c4 /* Expresion ROM Win Remap */
+#define MVPEX_EROMWC 0x18c0 /* Expression ROM Win Control */
+#define MVPEX_EROMWR 0x18c4 /* Expression ROM Win Remap */
/* PCI Express Control and Status Registers */
#define MVPEX_CTRL 0x1a00 /* Control */
#define MVPEX_CTRL_CONFROOTCOMPLEX (1 << 1)
Index: src/usr.bin/vgrind/regexp.c
diff -u src/usr.bin/vgrind/regexp.c:1.13 src/usr.bin/vgrind/regexp.c:1.14
--- src/usr.bin/vgrind/regexp.c:1.13 Tue Jul 15 13:17:15 2014
+++ src/usr.bin/vgrind/regexp.c Fri Dec 27 09:32:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: regexp.c,v 1.13 2014/07/15 13:17:15 christos Exp $ */
+/* $NetBSD: regexp.c,v 1.14 2019/12/27 09:32:10 msaitoh Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -44,7 +44,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)regexp.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: regexp.c,v 1.13 2014/07/15 13:17:15 christos Exp $");
+__RCSID("$NetBSD: regexp.c,v 1.14 2019/12/27 09:32:10 msaitoh Exp $");
#endif /* not lint */
#include <assert.h>
@@ -330,7 +330,7 @@ expconv(void)
/*
- * The following routine recognises an irregular expresion
+ * The following routine recognises an irregular expression
* with the following special characters:
*
* \? - means last match was optional
