summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Binkert <nate@cvs.openbsd.org>2002-07-02 19:38:56 +0000
committerNathan Binkert <nate@cvs.openbsd.org>2002-07-02 19:38:56 +0000
commit455d1983e8764c0949b892923117c63399cdedb5 (patch)
tree12f00626cd371f548174bd24633cbed074be5590
parent08164aa7b48cddaba444394214fd10fa49bf5cd9 (diff)
inital -> initial
-rw-r--r--sys/crypto/blf.h4
-rw-r--r--sys/dev/ic/am7990reg.h6
-rw-r--r--sys/dev/ic/mc6845.h4
-rw-r--r--sys/dev/ic/rtl81x9.c4
-rw-r--r--sys/dev/isa/sbreg.h4
-rw-r--r--sys/dev/rasops/rasops.h4
-rw-r--r--sys/net/rtsock.c4
-rw-r--r--sys/netiso/tp_subr2.c4
-rw-r--r--sys/uvm/uvm_swap.c10
-rw-r--r--sys/uvm/uvm_swap_encrypt.c14
-rw-r--r--sys/uvm/uvm_swap_encrypt.h4
-rw-r--r--sys/xfs/xfs_dev-common.c4
12 files changed, 33 insertions, 33 deletions
diff --git a/sys/crypto/blf.h b/sys/crypto/blf.h
index e32a9ef18d5..5b978e28947 100644
--- a/sys/crypto/blf.h
+++ b/sys/crypto/blf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: blf.h,v 1.4 2002/03/14 01:26:51 millert Exp $ */
+/* $OpenBSD: blf.h,v 1.5 2002/07/02 19:38:54 nate Exp $ */
/*
* Blowfish - a fast block cipher designed by Bruce Schneier
@@ -36,7 +36,7 @@
#define _BLF_H_
/* Schneier states the maximum key length to be 56 bytes.
- * The way how the subkeys are initalized by the key up
+ * The way how the subkeys are initialized by the key up
* to (N+2)*4 i.e. 72 bytes are utilized.
* Warning: For normal blowfish encryption only 56 bytes
* of the key affect all cipherbits.
diff --git a/sys/dev/ic/am7990reg.h b/sys/dev/ic/am7990reg.h
index 62722c9937f..db12f3da73e 100644
--- a/sys/dev/ic/am7990reg.h
+++ b/sys/dev/ic/am7990reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: am7990reg.h,v 1.3 1999/03/12 18:52:21 jason Exp $ */
+/* $OpenBSD: am7990reg.h,v 1.4 2002/07/02 19:38:55 nate Exp $ */
/* $NetBSD: am7990reg.h,v 1.1 1995/04/11 04:17:50 mycroft Exp $ */
/*-
@@ -114,7 +114,7 @@ struct leinit {
#define LE_C0_MERR 0x0800 /* memory error */
#define LE_C0_RINT 0x0400 /* receiver interrupt */
#define LE_C0_TINT 0x0200 /* transmitter interrupt */
-#define LE_C0_IDON 0x0100 /* initalization done */
+#define LE_C0_IDON 0x0100 /* initialization done */
#define LE_C0_INTR 0x0080 /* interrupt condition */
#define LE_C0_INEA 0x0040 /* interrupt enable */
#define LE_C0_RXON 0x0020 /* receiver on */
@@ -122,7 +122,7 @@ struct leinit {
#define LE_C0_TDMD 0x0008 /* transmit demand */
#define LE_C0_STOP 0x0004 /* disable all external activity */
#define LE_C0_STRT 0x0002 /* enable external activity */
-#define LE_C0_INIT 0x0001 /* begin initalization */
+#define LE_C0_INIT 0x0001 /* begin initialization */
#define LE_C0_BITS \
"\20\20ERR\17BABL\16CERR\15MISS\14MERR\13RINT\
diff --git a/sys/dev/ic/mc6845.h b/sys/dev/ic/mc6845.h
index af23817d3f8..328f8a4e387 100644
--- a/sys/dev/ic/mc6845.h
+++ b/sys/dev/ic/mc6845.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mc6845.h,v 1.2 1996/09/23 15:07:50 mickey Exp $ */
+/* $OpenBSD: mc6845.h,v 1.3 2002/07/02 19:38:55 nate Exp $ */
/*
* Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -47,7 +47,7 @@
#define CRTC_HSYNCE 0x05 /* horizontal sync end */
#define CRTC_VTOTAL 0x06 /* vertical total */
#define CRTC_OVERFLL 0x07 /* overflow low */
-#define CRTC_IROWADDR 0x08 /* inital row address */
+#define CRTC_IROWADDR 0x08 /* initial row address */
#define CRTC_MAXROW 0x09 /* maximum row address */
#define CRTC_CURSTART 0x0A /* cursor start row address */
#define CRTC_CUREND 0x0B /* cursor end row address */
diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c
index 1161ef4a985..1e1ee05de86 100644
--- a/sys/dev/ic/rtl81x9.c
+++ b/sys/dev/ic/rtl81x9.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtl81x9.c,v 1.17 2002/06/09 03:14:18 todd Exp $ */
+/* $OpenBSD: rtl81x9.c,v 1.18 2002/07/02 19:38:55 nate Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -978,7 +978,7 @@ void rl_init(xsc)
CSR_WRITE_1(sc, RL_COMMAND, RL_CMD_TX_ENB|RL_CMD_RX_ENB);
/*
- * Set the inital TX and RX configuration.
+ * Set the initial TX and RX configuration.
*/
CSR_WRITE_4(sc, RL_TXCFG, RL_TXCFG_CONFIG);
CSR_WRITE_4(sc, RL_RXCFG, RL_RXCFG_CONFIG);
diff --git a/sys/dev/isa/sbreg.h b/sys/dev/isa/sbreg.h
index f63c6818c67..b4a1129c8fa 100644
--- a/sys/dev/isa/sbreg.h
+++ b/sys/dev/isa/sbreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbreg.h,v 1.5 2002/06/06 20:58:07 aaron Exp $ */
+/* $OpenBSD: sbreg.h,v 1.6 2002/07/02 19:38:55 nate Exp $ */
/* $NetBSD: sbreg.h,v 1.24 1997/08/24 23:24:51 augustss Exp $ */
/*
@@ -267,7 +267,7 @@
/*
* The ADPCM encodings are differential, meaning each sample represents
- * a difference to add to a running sum. The inital value is called the
+ * a difference to add to a running sum. The initial value is called the
* reference, or reference byte. Any of the ADPCM DMA transfers can specify
* that the given transfer begins with a reference byte by or'ing
* in the bit below.
diff --git a/sys/dev/rasops/rasops.h b/sys/dev/rasops/rasops.h
index 920e5c79fe3..763b2192fd5 100644
--- a/sys/dev/rasops/rasops.h
+++ b/sys/dev/rasops/rasops.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rasops.h,v 1.2 2002/03/14 01:27:02 millert Exp $ */
+/* $OpenBSD: rasops.h,v 1.3 2002/07/02 19:38:55 nate Exp $ */
/* $NetBSD: rasops.h,v 1.13 2000/06/13 13:36:54 ad Exp $ */
/*-
@@ -124,7 +124,7 @@ struct rasops_info {
*/
/*
- * Per-depth initalization functions. These should not be called outside
+ * Per-depth initialization functions. These should not be called outside
* the rasops code.
*/
void rasops1_init(struct rasops_info *);
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index b7f94bd7278..5ed615dfc9e 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtsock.c,v 1.21 2002/03/15 18:19:52 millert Exp $ */
+/* $OpenBSD: rtsock.c,v 1.22 2002/07/02 19:38:55 nate Exp $ */
/* $NetBSD: rtsock.c,v 1.18 1996/03/29 00:32:10 cgd Exp $ */
/*
@@ -455,7 +455,7 @@ rt_xaddrs(cp, cplim, rtinfo)
/*
* Copy data from a buffer back into the indicated mbuf chain,
* starting "off" bytes from the beginning, extending the mbuf
- * chain if necessary. The mbuf needs to be properly initalized
+ * chain if necessary. The mbuf needs to be properly initialized
* including the setting of m_len.
*/
void
diff --git a/sys/netiso/tp_subr2.c b/sys/netiso/tp_subr2.c
index 8361948653b..bee6bb93888 100644
--- a/sys/netiso/tp_subr2.c
+++ b/sys/netiso/tp_subr2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tp_subr2.c,v 1.5 2002/04/29 06:26:51 pvalchev Exp $ */
+/* $OpenBSD: tp_subr2.c,v 1.6 2002/07/02 19:38:55 nate Exp $ */
/* $NetBSD: tp_subr2.c,v 1.11 1996/03/26 22:27:01 christos Exp $ */
/*-
@@ -548,7 +548,7 @@ tp_mss(tpcb, nhdr_size)
* While we're here, check if there's an initial rtt
* or rttvar. Convert from the route-table units
* to hz ticks for the smoothed timers and slow-timeout units
- * for other inital variables.
+ * for other initial variables.
*/
if (tpcb->tp_rtt == 0 && (rtt = rt->rt_rmx.rmx_rtt)) {
tpcb->tp_rtt = rtt * hz / RTM_RTTUNIT;
diff --git a/sys/uvm/uvm_swap.c b/sys/uvm/uvm_swap.c
index 380090a2cbc..406ff61b4a8 100644
--- a/sys/uvm/uvm_swap.c
+++ b/sys/uvm/uvm_swap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_swap.c,v 1.53 2002/05/24 13:10:53 art Exp $ */
+/* $OpenBSD: uvm_swap.c,v 1.54 2002/07/02 19:38:55 nate Exp $ */
/* $NetBSD: uvm_swap.c,v 1.40 2000/11/17 11:39:39 mrg Exp $ */
/*
@@ -1720,7 +1720,7 @@ uvm_swap_free(startslot, nslots)
#ifdef UVM_SWAP_ENCRYPT
{
int i;
- if (swap_encrypt_initalized) {
+ if (swap_encrypt_initialized) {
/* Dereference keys */
for (i = 0; i < nslots; i++)
if (uvm_swap_needdecrypt(sdp, startslot + i))
@@ -1854,7 +1854,7 @@ uvm_swap_io(pps, startslot, npages, flags)
encrypt = 1;
}
- if (swap_encrypt_initalized || encrypt) {
+ if (swap_encrypt_initialized || encrypt) {
/*
* we need to know the swap device that we are swapping to/from
* to see if the pages need to be marked for decryption or
@@ -1985,7 +1985,7 @@ uvm_swap_io(pps, startslot, npages, flags)
bp->b_dirtyend = npages << PAGE_SHIFT;
#ifdef UVM_SWAP_ENCRYPT
/* mark the pages in the drum for decryption */
- if (swap_encrypt_initalized)
+ if (swap_encrypt_initialized)
uvm_swap_markdecrypt(sdp, startslot, npages, encrypt);
#endif
s = splbio();
@@ -2023,7 +2023,7 @@ uvm_swap_io(pps, startslot, npages, flags)
/*
* decrypt swap
*/
- if (swap_encrypt_initalized &&
+ if (swap_encrypt_initialized &&
(bp->b_flags & B_READ) && !(bp->b_flags & B_ERROR)) {
int i;
caddr_t data = bp->b_data;
diff --git a/sys/uvm/uvm_swap_encrypt.c b/sys/uvm/uvm_swap_encrypt.c
index fbcce3c9e8f..bf1f3a14363 100644
--- a/sys/uvm/uvm_swap_encrypt.c
+++ b/sys/uvm/uvm_swap_encrypt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_swap_encrypt.c,v 1.10 2001/11/06 19:53:21 miod Exp $ */
+/* $OpenBSD: uvm_swap_encrypt.c,v 1.11 2002/07/02 19:38:55 nate Exp $ */
/*
* Copyright 1999 Niels Provos <provos@citi.umich.edu>
@@ -49,7 +49,7 @@ int uvm_doswapencrypt = 0;
u_int uvm_swpkeyscreated = 0;
u_int uvm_swpkeysdeleted = 0;
-int swap_encrypt_initalized = 0;
+int swap_encrypt_initialized = 0;
int
swap_encrypt_ctl(name, namelen, oldp, oldlenp, newp, newlen, p)
@@ -75,7 +75,7 @@ swap_encrypt_ctl(name, namelen, oldp, oldlenp, newp, newlen, p)
return result;
/* Swap Encryption has been turned on, we need to
- * initalize state for swap devices that have been
+ * initialize state for swap devices that have been
* added
*/
if (doencrypt)
@@ -130,8 +130,8 @@ swap_encrypt(struct swap_key *key, caddr_t src, caddr_t dst,
u_int32_t iv[4];
u_int32_t iv1, iv2, iv3, iv4;
- if (!swap_encrypt_initalized)
- swap_encrypt_initalized = 1;
+ if (!swap_encrypt_initialized)
+ swap_encrypt_initialized = 1;
swap_key_prepare(key, 1);
@@ -175,8 +175,8 @@ swap_decrypt(struct swap_key *key, caddr_t src, caddr_t dst,
u_int32_t iv[4];
u_int32_t iv1, iv2, iv3, iv4, niv1, niv2, niv3, niv4;
- if (!swap_encrypt_initalized)
- panic("swap_decrypt: key not initalized");
+ if (!swap_encrypt_initialized)
+ panic("swap_decrypt: key not initialized");
swap_key_prepare(key, 0);
diff --git a/sys/uvm/uvm_swap_encrypt.h b/sys/uvm/uvm_swap_encrypt.h
index 9a43dfb6fea..63d237062e2 100644
--- a/sys/uvm/uvm_swap_encrypt.h
+++ b/sys/uvm/uvm_swap_encrypt.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_swap_encrypt.h,v 1.6 2002/03/14 01:27:19 millert Exp $ */
+/* $OpenBSD: uvm_swap_encrypt.h,v 1.7 2002/07/02 19:38:55 nate Exp $ */
/*
* Copyright 1999 Niels Provos <provos@citi.umich.edu>
@@ -77,6 +77,6 @@ void swap_key_delete(struct swap_key *);
extern int uvm_doswapencrypt; /* swapencrypt enabled/disabled */
extern int uvm_swprekeyprint;
extern u_int uvm_swpkeyexpire; /* expiry time for keys (tR) */
-extern int swap_encrypt_initalized;
+extern int swap_encrypt_initialized;
#endif /* _UVM_SWAP_ENCRYPT_H */
diff --git a/sys/xfs/xfs_dev-common.c b/sys/xfs/xfs_dev-common.c
index 929e8a41628..d3894d3a19a 100644
--- a/sys/xfs/xfs_dev-common.c
+++ b/sys/xfs/xfs_dev-common.c
@@ -39,7 +39,7 @@
#include <xfs/xfs_dev.h>
#include <xfs/xfs_deb.h>
-RCSID("$Id: xfs_dev-common.c,v 1.4 2002/06/07 04:10:32 hin Exp $");
+RCSID("$Id: xfs_dev-common.c,v 1.5 2002/07/02 19:38:55 nate Exp $");
struct xfs_channel xfs_channel[NXFS];
@@ -106,7 +106,7 @@ xfs_devopen_common(dev_t dev, struct proc *p)
chan->message_buffer = xfs_alloc(MAX_XMSG_SIZE);
- /* initalize the queues if they have not been initialized before */
+ /* initialize the queues if they have not been initialized before */
xfs_initq(&chan->sleepq);
xfs_initq(&chan->messageq);