summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/cats/cats/cats_machdep.c4
-rw-r--r--sys/arch/i386/include/reg.h4
-rw-r--r--sys/arch/m68k/060sp/fpsp.s4
-rw-r--r--sys/arch/m68k/060sp/pfpsp.s4
-rw-r--r--sys/compat/linux/linux_misc.c8
-rw-r--r--sys/dev/eisa/aha1742.c4
-rw-r--r--sys/dev/ic/elink3reg.h4
-rw-r--r--sys/dev/ic/uha.c4
-rw-r--r--sys/dev/isa/wds.c4
-rw-r--r--sys/dev/pci/bktr/bktr_card.c4
-rw-r--r--sys/dev/pci/if_em_hw.c4
-rw-r--r--sys/dev/pci/if_nge.c4
-rw-r--r--sys/netinet/ip_spd.c4
-rw-r--r--sys/ufs/ffs/ffs_vnops.c4
-rw-r--r--sys/ufs/lfs/lfs_segment.c4
-rw-r--r--sys/ufs/ufs/ufs_inode.c4
-rw-r--r--sys/ufs/ufs/ufs_vnops.c4
-rw-r--r--sys/xfs/xfs_node.h4
18 files changed, 38 insertions, 38 deletions
diff --git a/sys/arch/cats/cats/cats_machdep.c b/sys/arch/cats/cats/cats_machdep.c
index 06e89c7290c..3bb7695d5d8 100644
--- a/sys/arch/cats/cats/cats_machdep.c
+++ b/sys/arch/cats/cats/cats_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cats_machdep.c,v 1.10 2005/01/21 16:22:34 miod Exp $ */
+/* $OpenBSD: cats_machdep.c,v 1.11 2005/02/17 18:07:37 jfb Exp $ */
/* $NetBSD: cats_machdep.c,v 1.50 2003/10/04 14:28:28 chris Exp $ */
/*
@@ -549,7 +549,7 @@ initarm(bootargs)
#endif
/*
- * Now we start consturction of the L1 page table
+ * Now we start construction of the L1 page table
* We start by mapping the L2 page tables into the L1.
* This means that we can replace L1 mappings later on if necessary
*/
diff --git a/sys/arch/i386/include/reg.h b/sys/arch/i386/include/reg.h
index fd1f7e73432..cafcc14b87c 100644
--- a/sys/arch/i386/include/reg.h
+++ b/sys/arch/i386/include/reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: reg.h,v 1.4 2003/09/08 21:49:12 mickey Exp $ */
+/* $OpenBSD: reg.h,v 1.5 2005/02/17 18:07:35 jfb Exp $ */
/* $NetBSD: reg.h,v 1.14 1995/10/11 04:20:24 mycroft Exp $ */
/*-
@@ -66,7 +66,7 @@
/*
* Registers accessible to ptrace(2) syscall for debugger
* The machine-dependent code for PT_{SET,GET}REGS needs to
- * use whichver order, defined above, is correct, so that it
+ * use whichever order, defined above, is correct, so that it
* is all invisible to the user.
*/
struct reg {
diff --git a/sys/arch/m68k/060sp/fpsp.s b/sys/arch/m68k/060sp/fpsp.s
index ccebb671bf5..f1c98d47060 100644
--- a/sys/arch/m68k/060sp/fpsp.s
+++ b/sys/arch/m68k/060sp/fpsp.s
@@ -1,5 +1,5 @@
#
-# $OpenBSD: fpsp.s,v 1.7 2004/01/09 21:16:05 deraadt Exp $
+# $OpenBSD: fpsp.s,v 1.8 2005/02/17 18:07:36 jfb Exp $
# $NetBSD: fpsp.s,v 1.2 1996/05/15 19:48:03 is Exp $
#
@@ -2954,7 +2954,7 @@ iea_fmovm_trace:
# The FPU is disabled and so we should really have taken the "Line
# F Emulator" exception. So, here we create an 8-word stack frame
# from our 4-word stack frame. This means we must calculate the length
-# the faulting instruction to get the "next PC". This is trivial for
+# of the faulting instruction to get the "next PC". This is trivial for
# immediate operands but requires some extra work for fmovm dynamic
# which can use most addressing modes.
iea_disabled:
diff --git a/sys/arch/m68k/060sp/pfpsp.s b/sys/arch/m68k/060sp/pfpsp.s
index d5c5a00464c..9e9186f910a 100644
--- a/sys/arch/m68k/060sp/pfpsp.s
+++ b/sys/arch/m68k/060sp/pfpsp.s
@@ -1,5 +1,5 @@
#
-# $OpenBSD: pfpsp.s,v 1.6 2004/01/09 21:16:06 deraadt Exp $
+# $OpenBSD: pfpsp.s,v 1.7 2005/02/17 18:07:36 jfb Exp $
# $NetBSD: pfpsp.s,v 1.2 1996/05/15 19:49:12 is Exp $
#
@@ -2954,7 +2954,7 @@ iea_fmovm_trace:
# The FPU is disabled and so we should really have taken the "Line
# F Emulator" exception. So, here we create an 8-word stack frame
# from our 4-word stack frame. This means we must calculate the length
-# the faulting instruction to get the "next PC". This is trivial for
+# of the faulting instruction to get the "next PC". This is trivial for
# immediate operands but requires some extra work for fmovm dynamic
# which can use most addressing modes.
iea_disabled:
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 8e1c43d7f59..dc9a315fada 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: linux_misc.c,v 1.57 2004/06/24 19:35:23 tholo Exp $ */
+/* $OpenBSD: linux_misc.c,v 1.58 2005/02/17 18:07:36 jfb Exp $ */
/* $NetBSD: linux_misc.c,v 1.27 1996/05/20 01:59:21 fvdl Exp $ */
/*-
@@ -527,7 +527,7 @@ linux_sys_uname(p, v, retval)
strlcpy(luts.l_machine, machine, sizeof(luts.l_machine));
strlcpy(luts.l_domainname, domainname, sizeof(luts.l_domainname));
- /* This part taken from the the uname() in libc */
+ /* This part taken from the uname() in libc */
len = sizeof(luts.l_version);
for (cp = luts.l_version; len--; ++cp)
if (*cp == '\n' || *cp == '\t')
@@ -556,7 +556,7 @@ linux_sys_olduname(p, v, retval)
strlcpy(luts.l_version, version, sizeof(luts.l_version));
strlcpy(luts.l_machine, machine, sizeof(luts.l_machine));
- /* This part taken from the the uname() in libc */
+ /* This part taken from the uname() in libc */
len = sizeof(luts.l_version);
for (cp = luts.l_version; len--; ++cp)
if (*cp == '\n' || *cp == '\t')
@@ -585,7 +585,7 @@ linux_sys_oldolduname(p, v, retval)
strlcpy(luts.l_version, version, sizeof(luts.l_version));
strlcpy(luts.l_machine, machine, sizeof(luts.l_machine));
- /* This part taken from the the uname() in libc */
+ /* This part taken from the uname() in libc */
len = sizeof(luts.l_version);
for (cp = luts.l_version; len--; ++cp)
if (*cp == '\n' || *cp == '\t')
diff --git a/sys/dev/eisa/aha1742.c b/sys/dev/eisa/aha1742.c
index 62befdb058f..463f5f11b1b 100644
--- a/sys/dev/eisa/aha1742.c
+++ b/sys/dev/eisa/aha1742.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aha1742.c,v 1.19 2004/12/26 21:22:11 miod Exp $ */
+/* $OpenBSD: aha1742.c,v 1.20 2005/02/17 18:07:36 jfb Exp $ */
/* $NetBSD: aha1742.c,v 1.61 1996/05/12 23:40:01 mycroft Exp $ */
/*
@@ -1058,7 +1058,7 @@ ahb_scsi_cmd(xs)
while (datalen && thisphys == nextphys) {
/*
* This page is contiguous (physically)
- * with the the last, just extend the
+ * with the last, just extend the
* length
*/
/* how far to the end of the page */
diff --git a/sys/dev/ic/elink3reg.h b/sys/dev/ic/elink3reg.h
index e53452137b7..5c6ededced6 100644
--- a/sys/dev/ic/elink3reg.h
+++ b/sys/dev/ic/elink3reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: elink3reg.h,v 1.14 2003/10/21 18:58:49 jmc Exp $ */
+/* $OpenBSD: elink3reg.h,v 1.15 2005/02/17 18:07:36 jfb Exp $ */
/* $NetBSD: elink3reg.h,v 1.13 1997/04/27 09:42:34 veego Exp $ */
/*
@@ -51,7 +51,7 @@
/*
* These are the registers for the 3Com 3c509 and their bit patterns when
- * applicable. They have been taken out the the "EtherLink III Parallel
+ * applicable. They have been taken out of the "EtherLink III Parallel
* Tasking EISA and ISA Technical Reference" "Beta Draft 10/30/92" manual
* from 3com.
*/
diff --git a/sys/dev/ic/uha.c b/sys/dev/ic/uha.c
index 15190263336..fd9ac7bb1df 100644
--- a/sys/dev/ic/uha.c
+++ b/sys/dev/ic/uha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uha.c,v 1.5 2004/12/26 21:22:13 miod Exp $ */
+/* $OpenBSD: uha.c,v 1.6 2005/02/17 18:07:36 jfb Exp $ */
/* $NetBSD: uha.c,v 1.3 1996/10/13 01:37:29 christos Exp $ */
#undef UHADEBUG
@@ -451,7 +451,7 @@ uha_scsi_cmd(xs)
while (datalen && thisphys == nextphys) {
/*
* This page is contiguous (physically)
- * with the the last, just extend the
+ * with the last, just extend the
* length
*/
/* how far to the end of the page */
diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c
index 69a4ac48efa..58b730a4d39 100644
--- a/sys/dev/isa/wds.c
+++ b/sys/dev/isa/wds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wds.c,v 1.19 2004/12/26 21:22:13 miod Exp $ */
+/* $OpenBSD: wds.c,v 1.20 2005/02/17 18:07:36 jfb Exp $ */
/* $NetBSD: wds.c,v 1.13 1996/11/03 16:20:31 mycroft Exp $ */
#undef WDSDIAG
@@ -1156,7 +1156,7 @@ wds_scsi_cmd(xs)
while (datalen && thisphys == nextphys) {
/*
* This page is contiguous (physically)
- * with the the last, just extend the
+ * with the last, just extend the
* length
*/
/* check it fits on the ISA bus */
diff --git a/sys/dev/pci/bktr/bktr_card.c b/sys/dev/pci/bktr/bktr_card.c
index cfc0693ea1c..55d0573adaa 100644
--- a/sys/dev/pci/bktr/bktr_card.c
+++ b/sys/dev/pci/bktr/bktr_card.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bktr_card.c,v 1.10 2004/10/15 08:59:32 jsg Exp $ */
+/* $OpenBSD: bktr_card.c,v 1.11 2005/02/17 18:07:36 jfb Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.16 2000/10/31 13:09:56 roger Exp $ */
/*
@@ -532,7 +532,7 @@ static int locate_eeprom_address( bktr_ptr_t bktr) {
*
* However some makes of card (eg Hauppauge) come with a configuration eeprom
* which tells us the make of the card. Most eeproms also tell us the
- * tuner type and other features of the the cards.
+ * tuner type and other features of the cards.
*
* The current probe code works as follows
* A) If the card uses a Bt878/879:
diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c
index 2c6f6b5f265..8bb8e0733d2 100644
--- a/sys/dev/pci/if_em_hw.c
+++ b/sys/dev/pci/if_em_hw.c
@@ -31,7 +31,7 @@
*******************************************************************************/
-/* $OpenBSD: if_em_hw.c,v 1.5 2004/11/16 14:39:14 brad Exp $ */
+/* $OpenBSD: if_em_hw.c,v 1.6 2005/02/17 18:07:36 jfb Exp $ */
/* if_em_hw.c
* Shared functions for accessing and configuring the MAC
*/
@@ -3564,7 +3564,7 @@ em_read_eeprom(struct em_hw *hw,
* hw - Struct containing variables accessed by shared code
*
* Reads the first 64 16 bit words of the EEPROM and sums the values read.
- * If the the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is
+ * If the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is
* valid.
*****************************************************************************/
int32_t
diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c
index 7f8faf56e02..501327053a4 100644
--- a/sys/dev/pci/if_nge.c
+++ b/sys/dev/pci/if_nge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_nge.c,v 1.30 2004/09/23 17:45:16 brad Exp $ */
+/* $OpenBSD: if_nge.c,v 1.31 2005/02/17 18:07:36 jfb Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -1164,7 +1164,7 @@ nge_alloc_jumbo_mem(sc)
/*
* Now divide it up into 9K pieces and save the addresses
* in an array. Note that we play an evil trick here by using
- * the first few bytes in the buffer to hold the the address
+ * the first few bytes in the buffer to hold the address
* of the softc structure for this interface. This is because
* nge_jfree() needs it, but it is called by the mbuf management
* code which will not pass it to us explicitly.
diff --git a/sys/netinet/ip_spd.c b/sys/netinet/ip_spd.c
index 357a567cdf4..d5fb0d5f58f 100644
--- a/sys/netinet/ip_spd.c
+++ b/sys/netinet/ip_spd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_spd.c,v 1.50 2004/06/21 23:50:37 tholo Exp $ */
+/* $OpenBSD: ip_spd.c,v 1.51 2005/02/17 18:07:36 jfb Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
*
@@ -64,7 +64,7 @@ int ipsec_acquire_pool_initialized = 0;
/*
* Lookup at the SPD based on the headers contained on the mbuf. The second
* argument indicates what protocol family the header at the beginning of
- * the mbuf is. hlen is the the offset of the transport protocol header
+ * the mbuf is. hlen is the offset of the transport protocol header
* in the mbuf.
*
* Return combinations (of return value and in *error):
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index e994cb68c74..2ae13f6714b 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_vnops.c,v 1.31 2004/03/02 05:46:01 tedu Exp $ */
+/* $OpenBSD: ffs_vnops.c,v 1.32 2005/02/17 18:07:37 jfb Exp $ */
/* $NetBSD: ffs_vnops.c,v 1.7 1996/05/11 18:27:24 mycroft Exp $ */
/*
@@ -299,7 +299,7 @@ ffs_reclaim(v)
{
struct vop_reclaim_args /* {
struct vnode *a_vp;
- sturct proc *a_p;
+ struct proc *a_p;
} */ *ap = v;
register struct vnode *vp = ap->a_vp;
int error;
diff --git a/sys/ufs/lfs/lfs_segment.c b/sys/ufs/lfs/lfs_segment.c
index 4e855f5bab4..18e38f828d7 100644
--- a/sys/ufs/lfs/lfs_segment.c
+++ b/sys/ufs/lfs/lfs_segment.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lfs_segment.c,v 1.12 2003/06/02 23:28:23 millert Exp $ */
+/* $OpenBSD: lfs_segment.c,v 1.13 2005/02/17 18:07:37 jfb Exp $ */
/* $NetBSD: lfs_segment.c,v 1.4 1996/02/09 22:28:54 christos Exp $ */
/*
@@ -861,7 +861,7 @@ lfs_writeseg(fs, sp)
* written. To avoid this problem, we allocate memory in chunks, copy
* the buffers into the chunk and write the chunk. MAXPHYS is the
* largest size I/O devices can handle.
- * When the data is copied to the chunk, turn off the the B_LOCKED bit
+ * When the data is copied to the chunk, turn off the B_LOCKED bit
* and brelse the buffer (which will move them to the LRU list). Add
* the B_CALL flag to the buffer header so we can count I/O's for the
* checkpoints and so we can release the allocated memory.
diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c
index 0bde6dfaff4..a42d85cd004 100644
--- a/sys/ufs/ufs/ufs_inode.c
+++ b/sys/ufs/ufs/ufs_inode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ufs_inode.c,v 1.25 2005/02/17 11:46:39 pedro Exp $ */
+/* $OpenBSD: ufs_inode.c,v 1.26 2005/02/17 18:07:37 jfb Exp $ */
/* $NetBSD: ufs_inode.c,v 1.7 1996/05/11 18:27:52 mycroft Exp $ */
/*
@@ -67,7 +67,7 @@ ufs_inactive(v)
{
struct vop_inactive_args /* {
struct vnode *a_vp;
- sturct proc *a_p;
+ struct proc *a_p;
} */ *ap = v;
struct vnode *vp = ap->a_vp;
struct inode *ip = VTOI(vp);
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 3c3eb88b5ae..a5edccdb01a 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ufs_vnops.c,v 1.59 2004/09/18 22:01:18 tedu Exp $ */
+/* $OpenBSD: ufs_vnops.c,v 1.60 2005/02/17 18:07:37 jfb Exp $ */
/* $NetBSD: ufs_vnops.c,v 1.18 1996/05/11 18:28:04 mycroft Exp $ */
/*
@@ -1697,7 +1697,7 @@ ufs_lock(v)
struct vop_lock_args /* {
struct vnode *a_vp;
int a_flags;
- sturct proc *a_p;
+ struct proc *a_p;
} */ *ap = v;
struct vnode *vp = ap->a_vp;
diff --git a/sys/xfs/xfs_node.h b/sys/xfs/xfs_node.h
index 2aef3a3e571..2b1285c7a40 100644
--- a/sys/xfs/xfs_node.h
+++ b/sys/xfs/xfs_node.h
@@ -139,8 +139,8 @@ typedef int vop_t (void *);
/*
* This is compat code for older vfs that have a
- * vget that only take a integer (really boolean) argument
- * that the the returned vnode will be returned locked
+ * vget that only takes an integer (really boolean) argument
+ * that the returned vnode will be returned locked
*/
#ifdef LK_EXCLUSIVE