Module Name: src
Committed By: snj
Date: Sun Mar 28 20:46:19 UTC 2010
Modified Files:
src/sys/arch/xen/x86: xen_shm_machdep.c
src/sys/arch/xen/xen: clock.c
src/sys/dev/ata: ata.c ata_wdc.c
src/sys/dev/ic: mvsata.c rtl81x9.c wdc.c
src/sys/dev/scsipi: atapi_wdc.c
Log Message:
Spell "enough" properly.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/xen/x86/xen_shm_machdep.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/xen/xen/clock.c
cvs rdiff -u -r1.112 -r1.113 src/sys/dev/ata/ata.c
cvs rdiff -u -r1.92 -r1.93 src/sys/dev/ata/ata_wdc.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/mvsata.c
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/ic/rtl81x9.c
cvs rdiff -u -r1.260 -r1.261 src/sys/dev/ic/wdc.c
cvs rdiff -u -r1.110 -r1.111 src/sys/dev/scsipi/atapi_wdc.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/xen/x86/xen_shm_machdep.c
diff -u src/sys/arch/xen/x86/xen_shm_machdep.c:1.7 src/sys/arch/xen/x86/xen_shm_machdep.c:1.8
--- src/sys/arch/xen/x86/xen_shm_machdep.c:1.7 Mon Oct 19 18:41:11 2009
+++ src/sys/arch/xen/x86/xen_shm_machdep.c Sun Mar 28 20:46:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_shm_machdep.c,v 1.7 2009/10/19 18:41:11 bouyer Exp $ */
+/* $NetBSD: xen_shm_machdep.c,v 1.8 2010/03/28 20:46:18 snj Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_shm_machdep.c,v 1.7 2009/10/19 18:41:11 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_shm_machdep.c,v 1.8 2010/03/28 20:46:18 snj Exp $");
#include <sys/types.h>
@@ -61,7 +61,7 @@
static u_long xen_shm_base_address_pg;
static vaddr_t xen_shm_end_address;
-/* Grab enouth VM space to map an entire vbd ring. */
+/* Grab enough VM space to map an entire vbd ring. */
/* Xen3 linux guests seems to eat more pages, gives enough for 10 vbd rings */
#define BLKIF_RING_SIZE __RING_SIZE((blkif_sring_t *)0, PAGE_SIZE)
#define XENSHM_NPAGES (BLKIF_RING_SIZE * (BLKIF_MAX_SEGMENTS_PER_REQUEST + 1) * 10)
Index: src/sys/arch/xen/xen/clock.c
diff -u src/sys/arch/xen/xen/clock.c:1.53 src/sys/arch/xen/xen/clock.c:1.54
--- src/sys/arch/xen/xen/clock.c:1.53 Sat Dec 12 14:44:10 2009
+++ src/sys/arch/xen/xen/clock.c Sun Mar 28 20:46:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.53 2009/12/12 14:44:10 tsutsui Exp $ */
+/* $NetBSD: clock.c,v 1.54 2010/03/28 20:46:18 snj Exp $ */
/*
*
@@ -29,7 +29,7 @@
#include "opt_xen.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.53 2009/12/12 14:44:10 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.54 2010/03/28 20:46:18 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -303,7 +303,7 @@
if (n < 500000) {
/*
* shadow_system_time is updated every hz tick, it's not
- * precise enouth for short delays. Use the CPU counter
+ * precise enough for short delays. Use the CPU counter
* instead. We assume it's working at this point.
*/
uint64_t cc, cc2, when;
Index: src/sys/dev/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.112 src/sys/dev/ata/ata.c:1.113
--- src/sys/dev/ata/ata.c:1.112 Wed Feb 24 22:37:56 2010
+++ src/sys/dev/ata/ata.c Sun Mar 28 20:46:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.112 2010/02/24 22:37:56 dyoung Exp $ */
+/* $NetBSD: ata.c,v 1.113 2010/03/28 20:46:18 snj Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.112 2010/02/24 22:37:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.113 2010/03/28 20:46:18 snj Exp $");
#include "opt_ata.h"
@@ -1232,7 +1232,7 @@
*/
if (atac->atac_set_modes)
/*
- * It's OK to pool here, it's fast enouth
+ * It's OK to pool here, it's fast enough
* to not bother waiting for interrupt
*/
if (ata_set_mode(drvp, 0x08 | (i + 3),
Index: src/sys/dev/ata/ata_wdc.c
diff -u src/sys/dev/ata/ata_wdc.c:1.92 src/sys/dev/ata/ata_wdc.c:1.93
--- src/sys/dev/ata/ata_wdc.c:1.92 Mon Oct 19 18:41:12 2009
+++ src/sys/dev/ata/ata_wdc.c Sun Mar 28 20:46:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_wdc.c,v 1.92 2009/10/19 18:41:12 bouyer Exp $ */
+/* $NetBSD: ata_wdc.c,v 1.93 2010/03/28 20:46:18 snj Exp $ */
/*
* Copyright (c) 1998, 2001, 2003 Manuel Bouyer.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.92 2009/10/19 18:41:12 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.93 2010/03/28 20:46:18 snj Exp $");
#include "opt_ata.h"
@@ -201,7 +201,7 @@
}
/*
* disable interrupts, all commands here should be quick
- * enouth to be able to poll, and we don't go here that often
+ * enough to be able to poll, and we don't go here that often
*/
bus_space_write_1(wdr->ctl_iot, wdr->ctl_ioh, wd_aux_ctlr,
WDCTL_4BIT | WDCTL_IDS);
Index: src/sys/dev/ic/mvsata.c
diff -u src/sys/dev/ic/mvsata.c:1.3 src/sys/dev/ic/mvsata.c:1.4
--- src/sys/dev/ic/mvsata.c:1.3 Tue Jan 5 13:30:10 2010
+++ src/sys/dev/ic/mvsata.c Sun Mar 28 20:46:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsata.c,v 1.3 2010/01/05 13:30:10 mbalmer Exp $ */
+/* $NetBSD: mvsata.c,v 1.4 2010/03/28 20:46:18 snj Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.3 2010/01/05 13:30:10 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.4 2010/03/28 20:46:18 snj Exp $");
#include "opt_mvsata.h"
@@ -1460,7 +1460,7 @@
/*
* disable interrupts, all commands here should be quick
- * enouth to be able to poll, and we don't go here that often
+ * enough to be able to poll, and we don't go here that often
*/
MVSATA_WDC_WRITE_1(mvport, SRB_CAS, WDCTL_4BIT | WDCTL_IDS);
MVSATA_WDC_WRITE_1(mvport, SRB_H, WDSD_IBM);
@@ -1822,7 +1822,7 @@
}
/*
* disable interrupts, all commands here should be quick
- * enouth to be able to poll, and we don't go here that often
+ * enough to be able to poll, and we don't go here that often
*/
MVSATA_WDC_WRITE_1(mvport, SRB_CAS, WDCTL_4BIT | WDCTL_IDS);
Index: src/sys/dev/ic/rtl81x9.c
diff -u src/sys/dev/ic/rtl81x9.c:1.88 src/sys/dev/ic/rtl81x9.c:1.89
--- src/sys/dev/ic/rtl81x9.c:1.88 Tue Jan 19 22:06:25 2010
+++ src/sys/dev/ic/rtl81x9.c Sun Mar 28 20:46:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl81x9.c,v 1.88 2010/01/19 22:06:25 pooka Exp $ */
+/* $NetBSD: rtl81x9.c,v 1.89 2010/03/28 20:46:18 snj Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.88 2010/01/19 22:06:25 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.89 2010/03/28 20:46:18 snj Exp $");
#include "rnd.h"
@@ -1246,7 +1246,7 @@
* fit in one DMA segment, and we need to copy. Note,
* the packet must also be aligned.
* if the packet is too small, copy it too, so we're sure
- * so have enouth room for the pad buffer.
+ * so have enough room for the pad buffer.
*/
if ((mtod(m_head, uintptr_t) & 3) != 0 ||
m_head->m_pkthdr.len < ETHER_PAD_LEN ||
Index: src/sys/dev/ic/wdc.c
diff -u src/sys/dev/ic/wdc.c:1.260 src/sys/dev/ic/wdc.c:1.261
--- src/sys/dev/ic/wdc.c:1.260 Thu Nov 12 19:37:17 2009
+++ src/sys/dev/ic/wdc.c Sun Mar 28 20:46:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc.c,v 1.260 2009/11/12 19:37:17 dyoung Exp $ */
+/* $NetBSD: wdc.c,v 1.261 2010/03/28 20:46:18 snj Exp $ */
/*
* Copyright (c) 1998, 2001, 2003 Manuel Bouyer. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.260 2009/11/12 19:37:17 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.261 2010/03/28 20:46:18 snj Exp $");
#include "opt_ata.h"
@@ -115,7 +115,7 @@
/*
* timeout when waiting for BSY to deassert when probing.
* set to 5s. From the standards this could be up to 31, but we can't
- * wait that much at boot time, and 5s seems to be enouth.
+ * wait that much at boot time, and 5s seems to be enough.
*/
#define WDC_PROBE_WAIT 5
Index: src/sys/dev/scsipi/atapi_wdc.c
diff -u src/sys/dev/scsipi/atapi_wdc.c:1.110 src/sys/dev/scsipi/atapi_wdc.c:1.111
--- src/sys/dev/scsipi/atapi_wdc.c:1.110 Mon Oct 19 18:41:16 2009
+++ src/sys/dev/scsipi/atapi_wdc.c Sun Mar 28 20:46:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: atapi_wdc.c,v 1.110 2009/10/19 18:41:16 bouyer Exp $ */
+/* $NetBSD: atapi_wdc.c,v 1.111 2010/03/28 20:46:18 snj Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.110 2009/10/19 18:41:16 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.111 2010/03/28 20:46:18 snj Exp $");
#ifndef ATADEBUG
#define ATADEBUG
@@ -473,7 +473,7 @@
}
/*
* disable interrupts, all commands here should be quick
- * enouth to be able to poll, and we don't go here that often
+ * enough to be able to poll, and we don't go here that often
*/
bus_space_write_1(wdr->ctl_iot, wdr->ctl_ioh, wd_aux_ctlr,
WDCTL_4BIT | WDCTL_IDS);
