From 45aab7d48ed19b1f5081b22ab94363df6f0e3708 Mon Sep 17 00:00:00 2001 From: Michael Hayes Date: Tue, 25 Feb 2003 03:14:19 -0800 Subject: [PATCH] [PATCH] Spelling fixes: guarantee guarentee -> guarantee guarenteed -> guaranteed guarentees -> guarantees --- arch/alpha/kernel/pci_iommu.c | 2 +- arch/ia64/lib/swiotlb.c | 2 +- arch/mips64/sgi-ip27/ip27-pci-dma.c | 2 +- arch/sparc/kernel/ioport.c | 2 +- arch/sparc/mm/sun4c.c | 2 +- arch/sparc64/kernel/traps.c | 2 +- arch/sparc64/lib/U3copy_from_user.S | 4 ++-- arch/sparc64/lib/U3copy_in_user.S | 4 ++-- arch/sparc64/lib/U3copy_to_user.S | 4 ++-- arch/sparc64/lib/U3memcpy.S | 4 ++-- drivers/block/cciss_scsi.c | 2 +- drivers/char/vt.c | 2 +- drivers/net/pppoe.c | 2 +- drivers/net/sungem.c | 2 +- drivers/net/sungem.h | 2 +- drivers/net/tg3.c | 4 ++-- fs/bio.c | 2 +- fs/mpage.c | 2 +- include/asm-alpha/pci.h | 2 +- include/asm-mips/pci.h | 2 +- include/asm-mips64/pci.h | 2 +- include/asm-sh/pci.h | 2 +- include/asm-sparc/pci.h | 2 +- include/asm-sparc64/pbm.h | 2 +- include/asm-sparc64/pci.h | 2 +- net/ipv4/netfilter/ip_conntrack_irc.c | 2 +- 26 files changed, 31 insertions(+), 31 deletions(-) diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c index 436502888e129..614aa87cb94ff 100644 --- a/arch/alpha/kernel/pci_iommu.c +++ b/arch/alpha/kernel/pci_iommu.c @@ -318,7 +318,7 @@ pci_map_page(struct pci_dev *pdev, struct page *page, unsigned long offset, /* Unmap a single streaming mode DMA translation. The DMA_ADDR and SIZE must match what was provided for in a previous pci_map_single call. All other usages are undefined. After this call, reads by - the cpu to the buffer are guarenteed to see whatever the device + the cpu to the buffer are guaranteed to see whatever the device wrote there. */ void diff --git a/arch/ia64/lib/swiotlb.c b/arch/ia64/lib/swiotlb.c index f390da81d018d..52a9df383b227 100644 --- a/arch/ia64/lib/swiotlb.c +++ b/arch/ia64/lib/swiotlb.c @@ -359,7 +359,7 @@ mark_clean (void *addr, size_t size) * was provided for in a previous swiotlb_map_single call. All other usages are * undefined. * - * After this call, reads by the cpu to the buffer are guarenteed to see whatever the + * After this call, reads by the cpu to the buffer are guaranteed to see whatever the * device wrote there. */ void diff --git a/arch/mips64/sgi-ip27/ip27-pci-dma.c b/arch/mips64/sgi-ip27/ip27-pci-dma.c index 88388cadf95e8..fcb71869c6a4f 100644 --- a/arch/mips64/sgi-ip27/ip27-pci-dma.c +++ b/arch/mips64/sgi-ip27/ip27-pci-dma.c @@ -74,7 +74,7 @@ dma_addr_t pci_map_single(struct pci_dev *hwdev, void *ptr, size_t size, * must match what was provided for in a previous pci_map_single call. All * other usages are undefined. * - * After this call, reads by the cpu to the buffer are guarenteed to see + * After this call, reads by the cpu to the buffer are guaranteed to see * whatever the device wrote there. */ void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index 0c2d23b36896b..3066f0cbc83b2 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c @@ -599,7 +599,7 @@ dma_addr_t pci_map_single(struct pci_dev *hwdev, void *ptr, size_t size, * must match what was provided for in a previous pci_map_single call. All * other usages are undefined. * - * After this call, reads by the cpu to the buffer are guarenteed to see + * After this call, reads by the cpu to the buffer are guaranteed to see * whatever the device wrote there. */ void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t ba, size_t size, diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c index f3a1e987be5ae..1096a2df5e44d 100644 --- a/arch/sparc/mm/sun4c.c +++ b/arch/sparc/mm/sun4c.c @@ -1042,7 +1042,7 @@ static struct thread_info *sun4c_alloc_thread_info(void) get_locked_segment(addr); /* We are changing the virtual color of the page(s) - * so we must flush the cache to guarentee consistency. + * so we must flush the cache to guarantee consistency. */ sun4c_flush_page(pages); #ifndef CONFIG_SUN4 diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c index 23e5a862f0883..78901988b1ae5 100644 --- a/arch/sparc64/kernel/traps.c +++ b/arch/sparc64/kernel/traps.c @@ -571,7 +571,7 @@ unsigned long __init cheetah_tune_scheduling(void) unsigned long flush_linesize = ecache_flush_linesize; unsigned long flush_size = ecache_flush_size; - /* Run through the whole cache to guarentee the timed loop + /* Run through the whole cache to guarantee the timed loop * is really displacing cache lines. */ __asm__ __volatile__("1: subcc %0, %4, %0\n\t" diff --git a/arch/sparc64/lib/U3copy_from_user.S b/arch/sparc64/lib/U3copy_from_user.S index a367d40e5854c..c2ae2f4f4b8b5 100644 --- a/arch/sparc64/lib/U3copy_from_user.S +++ b/arch/sparc64/lib/U3copy_from_user.S @@ -416,7 +416,7 @@ U3copy_from_user_toosmall: 2: VISEntryHalf ! MS+MS - /* Compute (len - (len % 8)) into %g2. This is guarenteed + /* Compute (len - (len % 8)) into %g2. This is guaranteed * to be nonzero. */ andn %o2, 0x7, %g2 ! A0 Group @@ -425,7 +425,7 @@ U3copy_from_user_toosmall: * one 8-byte longword past the end of src. It actually * does not, as %g2 is subtracted as loads are done from * src, so we always stop before running off the end. - * Also, we are guarenteed to have at least 0x10 bytes + * Also, we are guaranteed to have at least 0x10 bytes * to move here. */ sub %g2, 0x8, %g2 ! A0 Group (reg-dep) diff --git a/arch/sparc64/lib/U3copy_in_user.S b/arch/sparc64/lib/U3copy_in_user.S index e28d34ac05afc..674e232b0a6b3 100644 --- a/arch/sparc64/lib/U3copy_in_user.S +++ b/arch/sparc64/lib/U3copy_in_user.S @@ -447,7 +447,7 @@ U3copy_in_user_toosmall: 2: VISEntryHalf ! MS+MS - /* Compute (len - (len % 8)) into %g2. This is guarenteed + /* Compute (len - (len % 8)) into %g2. This is guaranteed * to be nonzero. */ andn %o2, 0x7, %g2 ! A0 Group @@ -456,7 +456,7 @@ U3copy_in_user_toosmall: * one 8-byte longword past the end of src. It actually * does not, as %g2 is subtracted as loads are done from * src, so we always stop before running off the end. - * Also, we are guarenteed to have at least 0x10 bytes + * Also, we are guaranteed to have at least 0x10 bytes * to move here. */ sub %g2, 0x8, %g2 ! A0 Group (reg-dep) diff --git a/arch/sparc64/lib/U3copy_to_user.S b/arch/sparc64/lib/U3copy_to_user.S index 055a61dc04b27..6b421fc2f12ea 100644 --- a/arch/sparc64/lib/U3copy_to_user.S +++ b/arch/sparc64/lib/U3copy_to_user.S @@ -463,7 +463,7 @@ U3copy_to_user_toosmall: 2: VISEntryHalf ! MS+MS - /* Compute (len - (len % 8)) into %g2. This is guarenteed + /* Compute (len - (len % 8)) into %g2. This is guaranteed * to be nonzero. */ andn %o2, 0x7, %g2 ! A0 Group @@ -472,7 +472,7 @@ U3copy_to_user_toosmall: * one 8-byte longword past the end of src. It actually * does not, as %g2 is subtracted as loads are done from * src, so we always stop before running off the end. - * Also, we are guarenteed to have at least 0x10 bytes + * Also, we are guaranteed to have at least 0x10 bytes * to move here. */ sub %g2, 0x8, %g2 ! A0 Group (reg-dep) diff --git a/arch/sparc64/lib/U3memcpy.S b/arch/sparc64/lib/U3memcpy.S index a2f6bffedff82..45994010399ec 100644 --- a/arch/sparc64/lib/U3memcpy.S +++ b/arch/sparc64/lib/U3memcpy.S @@ -344,7 +344,7 @@ U3memcpy_toosmall: 2: VISEntryHalf ! MS+MS - /* Compute (len - (len % 8)) into %g2. This is guarenteed + /* Compute (len - (len % 8)) into %g2. This is guaranteed * to be nonzero. */ andn %o2, 0x7, %g2 ! A0 Group @@ -353,7 +353,7 @@ U3memcpy_toosmall: * one 8-byte longword past the end of src. It actually * does not, as %g2 is subtracted as loads are done from * src, so we always stop before running off the end. - * Also, we are guarenteed to have at least 0x10 bytes + * Also, we are guaranteed to have at least 0x10 bytes * to move here. */ sub %g2, 0x8, %g2 ! A0 Group (reg-dep) diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c index 071ae3c8d30d2..021b2c6f90f2a 100644 --- a/drivers/block/cciss_scsi.c +++ b/drivers/block/cciss_scsi.c @@ -210,7 +210,7 @@ scsi_cmd_stack_setup(int ctlr, struct cciss_scsi_adapter_data_t *sa) stk = &sa->cmd_stack; size = sizeof(struct cciss_scsi_cmd_stack_elem_t) * CMD_STACK_SIZE; - // pci_alloc_consistent guarentees 32-bit DMA address will + // pci_alloc_consistent guarantees 32-bit DMA address will // be used stk->pool = (struct cciss_scsi_cmd_stack_elem_t *) diff --git a/drivers/char/vt.c b/drivers/char/vt.c index 3be37eb8686e8..bf81138476b99 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c @@ -1882,7 +1882,7 @@ again: buf = con_buf; } - /* At this point 'buf' is guarenteed to be a kernel buffer + /* At this point 'buf' is guaranteed to be a kernel buffer * and therefore no access to userspace (and therefore sleeping) * will be needed. The con_buf_sem serializes all tty based * console rendering and vcs write/read operations. We hold diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index 6886831b76b62..662f966802b4c 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c @@ -292,7 +292,7 @@ static void pppoe_flush_dev(struct net_device *dev) /* Now restart from the beginning of this * hash chain. We always NULL out pppoe_dev - * so we are guarenteed to make forward + * so we are guaranteed to make forward * progress. */ po = item_hash_table[hash]; diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 4a8d9c4f68197..7c139fdafea6c 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c @@ -2991,7 +2991,7 @@ static int __devinit gem_init_one(struct pci_dev *pdev, gem_begin_auto_negotiation(gp, NULL); spin_unlock_irq(&gp->lock); - /* It is guarenteed that the returned buffer will be at least + /* It is guaranteed that the returned buffer will be at least * PAGE_SIZE aligned. */ gp->init_block = (struct gem_init_block *) diff --git a/drivers/net/sungem.h b/drivers/net/sungem.h index dfa2f1a3ed079..d9ac2f8c47c5d 100644 --- a/drivers/net/sungem.h +++ b/drivers/net/sungem.h @@ -830,7 +830,7 @@ struct gem_txd { * RX Kick register) by the driver it must make sure the buffers are * truly ready and that the ownership bits are set properly. * - * Even though GEM modifies the RX descriptors, it guarentees that the + * Even though GEM modifies the RX descriptors, it guarantees that the * buffer DMA address field will stay the same when it performs these * updates. Therefore it can be used to keep track of DMA mappings * by the host driver just as in the TX descriptor case above. diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index afdba4475819f..15e3aba85360e 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -2194,7 +2194,7 @@ static int tigon3_4gb_hwbug_workaround(struct tg3 *tp, struct sk_buff *skb, int i; #if !PCI_DMA_BUS_IS_PHYS - /* IOMMU, just map the guilty area again which is guarenteed to + /* IOMMU, just map the guilty area again which is guaranteed to * use different addresses. */ @@ -2229,7 +2229,7 @@ static int tigon3_4gb_hwbug_workaround(struct tg3 *tp, struct sk_buff *skb, return -1; } - /* New SKB is guarenteed to be linear. */ + /* New SKB is guaranteed to be linear. */ entry = *start; new_addr = pci_map_single(tp->pdev, new_skb->data, new_skb->len, PCI_DMA_TODEVICE); diff --git a/fs/bio.c b/fs/bio.c index 5243d1d12b68b..3002a6b05dd40 100644 --- a/fs/bio.c +++ b/fs/bio.c @@ -334,7 +334,7 @@ oom: * @bdev: I/O target * * Return the approximate number of pages we can send to this target. - * There's no guarentee that you will be able to fit this number of pages + * There's no guarantee that you will be able to fit this number of pages * into a bio, it does not account for dynamic restrictions that vary * on offset. */ diff --git a/fs/mpage.c b/fs/mpage.c index 3460144c18942..45f79b8da045e 100644 --- a/fs/mpage.c +++ b/fs/mpage.c @@ -598,7 +598,7 @@ out: * If a page is already under I/O, generic_writepages() skips it, even * if it's dirty. This is desirable behaviour for memory-cleaning writeback, * but it is INCORRECT for data-integrity system calls such as fsync(). fsync() - * and msync() need to guarentee that all the data which was dirty at the time + * and msync() need to guarantee that all the data which was dirty at the time * the call was made get new I/O started against them. So if called_for_sync() * is true, we must wait for existing IO to complete. * diff --git a/include/asm-alpha/pci.h b/include/asm-alpha/pci.h index 472a96bdd49b6..3f88b46f8dfed 100644 --- a/include/asm-alpha/pci.h +++ b/include/asm-alpha/pci.h @@ -97,7 +97,7 @@ extern dma_addr_t pci_map_page(struct pci_dev *, struct page *, /* Unmap a single streaming mode DMA translation. The DMA_ADDR and SIZE must match what was provided for in a previous pci_map_single call. All other usages are undefined. After this call, reads by - the cpu to the buffer are guarenteed to see whatever the device + the cpu to the buffer are guaranteed to see whatever the device wrote there. */ extern void pci_unmap_single(struct pci_dev *, dma_addr_t, size_t, int); diff --git a/include/asm-mips/pci.h b/include/asm-mips/pci.h index 1ae7c25df61f5..84c9bd2b9bfb5 100644 --- a/include/asm-mips/pci.h +++ b/include/asm-mips/pci.h @@ -102,7 +102,7 @@ extern inline dma_addr_t pci_map_single(struct pci_dev *hwdev, void *ptr, * must match what was provided for in a previous pci_map_single call. All * other usages are undefined. * - * After this call, reads by the cpu to the buffer are guarenteed to see + * After this call, reads by the cpu to the buffer are guaranteed to see * whatever the device wrote there. */ extern inline void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, diff --git a/include/asm-mips64/pci.h b/include/asm-mips64/pci.h index d18ee0cd62bae..a7cc388c58243 100644 --- a/include/asm-mips64/pci.h +++ b/include/asm-mips64/pci.h @@ -126,7 +126,7 @@ static inline dma_addr_t pci_map_single(struct pci_dev *hwdev, void *ptr, * must match what was provided for in a previous pci_map_single call. All * other usages are undefined. * - * After this call, reads by the cpu to the buffer are guarenteed to see + * After this call, reads by the cpu to the buffer are guaranteed to see * whatever the device wrote there. */ static inline void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, diff --git a/include/asm-sh/pci.h b/include/asm-sh/pci.h index d580d57aad0b1..f9690c521d193 100644 --- a/include/asm-sh/pci.h +++ b/include/asm-sh/pci.h @@ -118,7 +118,7 @@ static inline dma_addr_t pci_map_single(struct pci_dev *hwdev, void *ptr, * must match what was provided for in a previous pci_map_single call. All * other usages are undefined. * - * After this call, reads by the cpu to the buffer are guarenteed to see + * After this call, reads by the cpu to the buffer are guaranteed to see * whatever the device wrote there. */ static inline void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, diff --git a/include/asm-sparc/pci.h b/include/asm-sparc/pci.h index 53d6d6e546a52..2c40d116e5c71 100644 --- a/include/asm-sparc/pci.h +++ b/include/asm-sparc/pci.h @@ -59,7 +59,7 @@ extern dma_addr_t pci_map_single(struct pci_dev *hwdev, void *ptr, size_t size, * must match what was provided for in a previous pci_map_single call. All * other usages are undefined. * - * After this call, reads by the cpu to the buffer are guarenteed to see + * After this call, reads by the cpu to the buffer are guaranteed to see * whatever the device wrote there. */ extern void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, size_t size, int direction); diff --git a/include/asm-sparc64/pbm.h b/include/asm-sparc64/pbm.h index af595343fefce..f3dc10516fdf2 100644 --- a/include/asm-sparc64/pbm.h +++ b/include/asm-sparc64/pbm.h @@ -59,7 +59,7 @@ struct pci_iommu { unsigned long iommu_ctxflush; /* IOMMU context flush register */ /* This is a register in the PCI controller, which if - * read will have no side-effects but will guarentee + * read will have no side-effects but will guarantee * completion of all previous writes into IOMMU/STC. */ unsigned long write_complete_reg; diff --git a/include/asm-sparc64/pci.h b/include/asm-sparc64/pci.h index 79c738565f5d8..53a010006c418 100644 --- a/include/asm-sparc64/pci.h +++ b/include/asm-sparc64/pci.h @@ -67,7 +67,7 @@ extern dma_addr_t pci_map_single(struct pci_dev *hwdev, void *ptr, size_t size, * must match what was provided for in a previous pci_map_single call. All * other usages are undefined. * - * After this call, reads by the cpu to the buffer are guarenteed to see + * After this call, reads by the cpu to the buffer are guaranteed to see * whatever the device wrote there. */ extern void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, size_t size, int direction); diff --git a/net/ipv4/netfilter/ip_conntrack_irc.c b/net/ipv4/netfilter/ip_conntrack_irc.c index 995bb4b4412eb..ab4f6c0d8420a 100644 --- a/net/ipv4/netfilter/ip_conntrack_irc.c +++ b/net/ipv4/netfilter/ip_conntrack_irc.c @@ -107,7 +107,7 @@ int parse_dcc(char *data, char *data_end, u_int32_t * ip, u_int16_t * port, static int help(const struct iphdr *iph, size_t len, struct ip_conntrack *ct, enum ip_conntrack_info ctinfo) { - /* tcplen not negative guarenteed by ip_conntrack_tcp.c */ + /* tcplen not negative guaranteed by ip_conntrack_tcp.c */ struct tcphdr *tcph = (void *) iph + iph->ihl * 4; const char *data = (const char *) tcph + tcph->doff * 4; const char *_data = data; -- 2.53.0