[PATCH] Spelling fixes for consistent, dependent, persistent

This fixes the following common misspellings and their variants.

  consistant -> consistent
  dependant  -> dependent
  persistant -> persistent

29 files changed, 34 insertions, 34 deletions

diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c
index f2f73e15a11b..46dd55038145 100644
--- a/arch/arm/mach-integrator/pci_v3.c
+++ b/arch/arm/mach-integrator/pci_v3.c
@@ -120,7 +120,7 @@
  *              function = which function
  *		offset = configuration space register we are interested in
  *
- * description:	this routine will generate a platform dependant config
+ * description:	this routine will generate a platform dependent config
  *		address.
  *
  * calls:	none
diff --git a/arch/arm/mach-sa1100/stork.c b/arch/arm/mach-sa1100/stork.c
index 0c34c9d61bb8..9ac3a0a10c7d 100644
--- a/arch/arm/mach-sa1100/stork.c
+++ b/arch/arm/mach-sa1100/stork.c
@@ -181,7 +181,7 @@ static void storkClockTS(void)
 {
     storkSetLatchB(STORK_TOUCH_SCREEN_DCLK);
     udelay(10);			 /* hmm wait 200ns (min) - ok this ought to be udelay(1) but that doesn't get */
-				 /* consistant values so I'm using 10 (urgh) */
+				 /* consistent values so I'm using 10 (urgh) */
     storkClearLatchB(STORK_TOUCH_SCREEN_DCLK);
     udelay(10);
 }
diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S
index 09a2b12fad9b..cbeaaf9a0853 100644
--- a/arch/arm/mm/proc-arm920.S
+++ b/arch/arm/mm/proc-arm920.S
@@ -297,7 +297,7 @@ ENTRY(cpu_arm920_dcache_clean_entry)
  *
  * This is a little misleading, it is not intended to clean out
  * the i-cache but to make sure that any data written to the
- * range is made consistant.  This means that when we execute code
+ * range is made consistent.  This means that when we execute code
  * in that region, everything works as we expect.
  *
  * This generally means writing back data in the Dcache and
diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S
index 7bfbc8965019..f115e476bc7b 100644
--- a/arch/arm/mm/proc-arm922.S
+++ b/arch/arm/mm/proc-arm922.S
@@ -298,7 +298,7 @@ ENTRY(cpu_arm922_dcache_clean_entry)
  *
  * This is a little misleading, it is not intended to clean out
  * the i-cache but to make sure that any data written to the
- * range is made consistant.  This means that when we execute code
+ * range is made consistent.  This means that when we execute code
  * in that region, everything works as we expect.
  *
  * This generally means writing back data in the Dcache and
diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S
index 24b5d4f70217..a2cdcdd3d9f3 100644
--- a/arch/arm/mm/proc-arm926.S
+++ b/arch/arm/mm/proc-arm926.S
@@ -147,7 +147,7 @@ cpu_arm926_cache_clean_invalidate_all_r2:
  *
  * This is a little misleading, it is not intended to clean out
  * the i-cache but to make sure that any data written to the
- * range is made consistant.  This means that when we execute code
+ * range is made consistent.  This means that when we execute code
  * in that region, everything works as we expect.
  *
  * This generally means writing back data in the Dcache and
diff --git a/arch/cris/drivers/serial.c b/arch/cris/drivers/serial.c
index 412f7519c488..13bcee964f09 100644
--- a/arch/cris/drivers/serial.c
+++ b/arch/cris/drivers/serial.c
@@ -318,7 +318,7 @@ static char *serial_version = "$Revision: 1.3 $";
 
 #include <asm/svinto.h>
 
-/* non-arch dependant serial structures are in linux/serial.h */
+/* non-arch dependent serial structures are in linux/serial.h */
 #include <linux/serial.h>
 /* while we keep our own stuff (struct e100_serial) in a local .h file */
 #include "serial.h"
diff --git a/arch/cris/kernel/ptrace.c b/arch/cris/kernel/ptrace.c
index b4e1f9282694..c8a066c4ee4c 100644
--- a/arch/cris/kernel/ptrace.c
+++ b/arch/cris/kernel/ptrace.c
@@ -18,7 +18,7 @@
  * PTRACE_DETACH works more simple in 2.4.10
  *
  * Revision 1.6  2001/07/25 16:08:47  bjornw
- * PTRACE_ATTACH bulk moved into arch-independant code in 2.4.7
+ * PTRACE_ATTACH bulk moved into arch-independent code in 2.4.7
  *
  * Revision 1.5  2001/03/26 14:24:28  orjanf
  * * Changed loop condition.
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 15d820d88c64..cb5a89f68763 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -551,7 +551,7 @@ __cpu_up (unsigned int cpu)
 }
 
 /*
- * Assume that CPU's have been discovered by some platform-dependant interface.  For
+ * Assume that CPU's have been discovered by some platform-dependent interface.  For
  * SoftSDV/Lion, that would be ACPI.
  *
  * Setup of the IPI irq handler is done in irq.c:init_IRQ_SMP().
diff --git a/arch/ia64/sn/io/sn1/pcibr.c b/arch/ia64/sn/io/sn1/pcibr.c
index ac30ed1badd8..6029f26613fe 100644
--- a/arch/ia64/sn/io/sn1/pcibr.c
+++ b/arch/ia64/sn/io/sn1/pcibr.c
@@ -4811,7 +4811,7 @@ pcibr_dmamap_alloc(devfs_handle_t pconn_vhdl,
 
 	    /* Device is capable of A64 operations,
 	     * and the attributes of the DMA are
-	     * consistant with any previous DMA
+	     * consistent with any previous DMA
 	     * mappings using shared resources.
 	     */
 
@@ -4853,7 +4853,7 @@ pcibr_dmamap_alloc(devfs_handle_t pconn_vhdl,
 	if (!pcibr_try_set_device(pcibr_soft, slot, flags, BRIDGE_DEV_D32_BITS)) {
 	    /* User desires DIRECT A32 operations,
 	     * and the attributes of the DMA are
-	     * consistant with any previous DMA
+	     * consistent with any previous DMA
 	     * mappings using shared resources.
 	     * Mapping calls may fail if target
 	     * is outside the direct32 range.
diff --git a/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c b/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c
index 867178f42fab..54939d8508c9 100644
--- a/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c
+++ b/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c
@@ -3216,7 +3216,7 @@ pcibr_dmamap_alloc(devfs_handle_t pconn_vhdl,
 
 	    /* Device is capable of A64 operations,
 	     * and the attributes of the DMA are
-	     * consistant with any previous DMA
+	     * consistent with any previous DMA
 	     * mappings using shared resources.
 	     */
 
@@ -3266,7 +3266,7 @@ pcibr_dmamap_alloc(devfs_handle_t pconn_vhdl,
 	if (!pcibr_try_set_device(pcibr_soft, slot, flags, BRIDGE_DEV_D32_BITS)) {
 	    /* User desires DIRECT A32 operations,
 	     * and the attributes of the DMA are
-	     * consistant with any previous DMA
+	     * consistent with any previous DMA
 	     * mappings using shared resources.
 	     * Mapping calls may fail if target
 	     * is outside the direct32 range.
diff --git a/arch/m68k/mac/macints.c b/arch/m68k/mac/macints.c
index 4f8ea17f57ac..b0a647a964fc 100644
--- a/arch/m68k/mac/macints.c
+++ b/arch/m68k/mac/macints.c
@@ -749,7 +749,7 @@ void mac_scc_dispatch(int irq, void *dev_id, struct pt_regs *regs)
 	/*                                              */
 	/* Note that we're ignoring scc_mask for now.   */
 	/* If we actually mask the ints then we tend to */
-	/* get hammered by very persistant SCC irqs,    */
+	/* get hammered by very persistent SCC irqs,    */
 	/* and since they're autovector interrupts they */
 	/* pretty much kill the system.                 */
 
diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c
index 53b448deb37a..5b43e574046d 100644
--- a/arch/m68k/mac/via.c
+++ b/arch/m68k/mac/via.c
@@ -48,7 +48,7 @@ __u8 rbv_clear;
  * just hit the combined register (ie, vIER|rIER) but that seems to
  * break on AV Macs...probably because they actually decode more than
  * eight address bits. Why can't Apple engineers at least be
- * _consistantly_ lazy?                          - 1999-05-21 (jmt)
+ * _consistently_ lazy?                          - 1999-05-21 (jmt)
  */
 
 static int gIER,gIFR,gBufA,gBufB;
diff --git a/arch/m68knommu/platform/68360/uCquicc/crt0_ram.S b/arch/m68knommu/platform/68360/uCquicc/crt0_ram.S
index c8d9142cdd24..56027aac42f8 100644
--- a/arch/m68knommu/platform/68360/uCquicc/crt0_ram.S
+++ b/arch/m68knommu/platform/68360/uCquicc/crt0_ram.S
@@ -358,7 +358,7 @@ _ramend:
     .long   0           /* (Unassigned, Reserved)                       - 62. */
     .long   0           /* (Unassigned, Reserved)                       - 63. */
     /*                  The assignment of these vectors to the CPM is         */
-    /*                  dependant on the configuration of the CPM vba         */
+    /*                  dependent on the configuration of the CPM vba         */
     /*                          fields.                                       */
     .long   0           /* (User-Defined Vectors 1) CPM Error           - 64. */
     .long   0           /* (User-Defined Vectors 2) CPM Parallel IO PC11- 65. */
diff --git a/arch/m68knommu/platform/68360/uCquicc/crt0_rom.S b/arch/m68knommu/platform/68360/uCquicc/crt0_rom.S
index 6c0df839eb7a..ed9187c740ac 100644
--- a/arch/m68knommu/platform/68360/uCquicc/crt0_rom.S
+++ b/arch/m68knommu/platform/68360/uCquicc/crt0_rom.S
@@ -367,7 +367,7 @@ _ramend:
     .long   0           /* (Unassigned, Reserved)                       - 62. */
     .long   0           /* (Unassigned, Reserved)                       - 63. */
     /*                  The assignment of these vectors to the CPM is         */
-    /*                  dependant on the configuration of the CPM vba         */
+    /*                  dependent on the configuration of the CPM vba         */
     /*                          fields.                                       */
     .long   0           /* (User-Defined Vectors 1) CPM Error           - 64. */
     .long   0           /* (User-Defined Vectors 2) CPM Parallel IO PC11- 65. */
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index 2b858b1b67a0..84064c3a02bd 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -689,7 +689,7 @@ syscall_exit_rfi:
 	 * (we don't store them in the sigcontext), so set them
 	 * to "proper" values now (otherwise we'll wind up restoring
 	 * whatever was last stored in the task structure, which might
-	 * be inconsistant if an interrupt occured while on the gateway
+	 * be inconsistent if an interrupt occured while on the gateway
 	 * page) Note that we may be "trashing" values the user put in
 	 * them, but we don't support the the user changing them.
 	 */
diff --git a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile
index 82f57d14b810..40cd523f7587 100644
--- a/arch/ppc/boot/simple/Makefile
+++ b/arch/ppc/boot/simple/Makefile
@@ -19,7 +19,7 @@
 # ENTRYPOINT which the image should be loaded at.  The optimal setting
 # for ENTRYPOINT is the link address.
 # (4) It is advisable to pass in the memory size using BI_MEMSIZE and
-# get_mem_size(), which is memory controller dependant.  Add in the correct
+# get_mem_size(), which is memory controller dependent.  Add in the correct
 # XXX_memory.o file for this to work, as well as editing the $(MISC) file.
 
 boot: zImage
diff --git a/arch/ppc/boot/simple/misc.c b/arch/ppc/boot/simple/misc.c
index e204557f2494..6b2909ed4eae 100644
--- a/arch/ppc/boot/simple/misc.c
+++ b/arch/ppc/boot/simple/misc.c
@@ -82,7 +82,7 @@ decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum)
 
 #if defined(CONFIG_LOPEC) || defined(CONFIG_PAL4)
 	/*
-	 * Call get_mem_size(), which is memory controller dependant,
+	 * Call get_mem_size(), which is memory controller dependent,
 	 * and we must have the correct file linked in here.
 	 */
 	TotalMemory = get_mem_size();
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c
index 90df3328b3e8..ee68f236114b 100644
--- a/arch/ppc/kernel/pci.c
+++ b/arch/ppc/kernel/pci.c
@@ -1069,7 +1069,7 @@ pcibios_init(void)
 	if (ppc_md.pci_swizzle && ppc_md.pci_map_irq)
 		pci_fixup_irqs(ppc_md.pci_swizzle, ppc_md.pci_map_irq);
 
-	/* Call machine dependant fixup */
+	/* Call machine dependent fixup */
 	if (ppc_md.pcibios_fixup)
 		ppc_md.pcibios_fixup();
 
diff --git a/arch/ppc64/kernel/pci.c b/arch/ppc64/kernel/pci.c
index 049a5e58ffd7..c459ee120097 100644
--- a/arch/ppc64/kernel/pci.c
+++ b/arch/ppc64/kernel/pci.c
@@ -413,7 +413,7 @@ pcibios_init(void)
 			next_busno = hose->last_busno+1;
 	}
 
-	/* Call machine dependant fixup */
+	/* Call machine dependent fixup */
 	if (ppc_md.pcibios_fixup) {
 		ppc_md.pcibios_fixup();
 	}
diff --git a/arch/sh/kernel/io.c b/arch/sh/kernel/io.c
index 1b0f0918dfd6..1f49c739d1bc 100644
--- a/arch/sh/kernel/io.c
+++ b/arch/sh/kernel/io.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2000  Stuart Menefy
  *
  * Provide real functions which expand to whatever the header file defined.
- * Also definitions of machine independant IO functions.
+ * Also definitions of machine independent IO functions.
  */
 
 #include <asm/io.h>
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index d4c1e922b59f..4434547f406d 100644
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -1889,7 +1889,7 @@ C_LABEL(kill_user_windows):
 	wr	%o4, 0x0, %psr			! the uwinmask state
 	WRITE_PAUSE				! burn them cycles
 1:
-	ld	[%g6 + TI_UWINMASK], %o0	! get consistant state
+	ld	[%g6 + TI_UWINMASK], %o0	! get consistent state
 	orcc	%g0, %o0, %g0			! did an interrupt come in?
 	be	4f				! yep, we are done
 	 rd	%wim, %o3			! get current wim
diff --git a/arch/sparc/kernel/sys_sparc.c b/arch/sparc/kernel/sys_sparc.c
index d060b430c08c..fbf31d498e8e 100644
--- a/arch/sparc/kernel/sys_sparc.c
+++ b/arch/sparc/kernel/sys_sparc.c
@@ -409,7 +409,7 @@ sparc_sigaction (int sig, const struct old_sigaction *act,
 	ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
 
 	if (!ret && oact) {
-		/* In the clone() case we could copy half consistant
+		/* In the clone() case we could copy half consistent
 		 * state to the user, however this could sleep and
 		 * deadlock us if we held the signal lock on SMP.  So for
 		 * now I take the easy way out and do no locking.
diff --git a/arch/sparc/kernel/sys_sunos.c b/arch/sparc/kernel/sys_sunos.c
index 1babc9d4d326..a81ca4978702 100644
--- a/arch/sparc/kernel/sys_sunos.c
+++ b/arch/sparc/kernel/sys_sunos.c
@@ -1168,7 +1168,7 @@ sunos_sigaction(int sig, const struct old_sigaction *act,
 	ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
 
 	if (!ret && oact) {
-		/* In the clone() case we could copy half consistant
+		/* In the clone() case we could copy half consistent
 		 * state to the user, however this could sleep and
 		 * deadlock us if we held the signal lock on SMP.  So for
 		 * now I take the easy way out and do no locking.
diff --git a/arch/sparc/math-emu/math.c b/arch/sparc/math-emu/math.c
index 050431cfcd87..cd15e4f41ef2 100644
--- a/arch/sparc/math-emu/math.c
+++ b/arch/sparc/math-emu/math.c
@@ -203,7 +203,7 @@ int do_mathemu(struct pt_regs *regs, struct task_struct *fpt)
 }
 
 /* All routines returning an exception to raise should detect
- * such exceptions _before_ rounding to be consistant with
+ * such exceptions _before_ rounding to be consistent with
  * the behavior of the hardware in the implemented cases
  * (and thus with the recommendations in the V9 architecture
  * manual).
diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c
index 74c23da4a7b0..5b165f0d3b1b 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 consistancy.
+	 * so we must flush the cache to guarentee consistency.
 	 */
 	sun4c_flush_page(pages);
 #ifndef CONFIG_SUN4	
diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c
index 27ffa86806f9..9a5f8a99cfdc 100644
--- a/arch/sparc64/kernel/sbus.c
+++ b/arch/sparc64/kernel/sbus.c
@@ -767,7 +767,7 @@ unsigned int sbus_build_irq(void *buscookie, unsigned int ino)
 	}
 	imap += reg_base;
 
-	/* SYSIO inconsistancy.  For external SLOTS, we have to select
+	/* SYSIO inconsistency.  For external SLOTS, we have to select
 	 * the right ICLR register based upon the lower SBUS irq level
 	 * bits.
 	 */
diff --git a/arch/sparc64/kernel/winfixup.S b/arch/sparc64/kernel/winfixup.S
index a633e009aae9..707e85e8f59b 100644
--- a/arch/sparc64/kernel/winfixup.S
+++ b/arch/sparc64/kernel/winfixup.S
@@ -60,7 +60,7 @@ fill_fixup:
 	sll		%g2, 3, %g2			! NORMAL-->OTHER
 
 	wrpr		%g0, 0x0, %canrestore		! Standard etrap stuff.
-	wrpr		%g2, 0x0, %wstate		! This must be consistant.
+	wrpr		%g2, 0x0, %wstate		! This must be consistent.
 	wrpr		%g0, 0x0, %otherwin		! We know this.
 	mov		PRIMARY_CONTEXT, %g1		! Change contexts...
 	stxa		%g0, [%g1] ASI_DMMU		! Back into the nucleus.
@@ -181,7 +181,7 @@ fill_fixup_mna:
 	sll		%g2, 3, %g2			! NORMAL-->OTHER
 	wrpr		%g0, 0x0, %canrestore		! Standard etrap stuff.
 
-	wrpr		%g2, 0x0, %wstate		! This must be consistant.
+	wrpr		%g2, 0x0, %wstate		! This must be consistent.
 	wrpr		%g0, 0x0, %otherwin		! We know this.
 	mov		PRIMARY_CONTEXT, %g1		! Change contexts...
 	stxa		%g0, [%g1] ASI_DMMU		! Back into the nucleus.
@@ -287,7 +287,7 @@ fill_fixup_dax:
 	sll		%g2, 3, %g2			! NORMAL-->OTHER
 	wrpr		%g0, 0x0, %canrestore		! Standard etrap stuff.
 
-	wrpr		%g2, 0x0, %wstate		! This must be consistant.
+	wrpr		%g2, 0x0, %wstate		! This must be consistent.
 	wrpr		%g0, 0x0, %otherwin		! We know this.
 	mov		PRIMARY_CONTEXT, %g1		! Change contexts...
 	stxa		%g0, [%g1] ASI_DMMU		! Back into the nucleus.
diff --git a/arch/sparc64/math-emu/math.c b/arch/sparc64/math-emu/math.c
index f45419845cde..48dfa37ddd72 100644
--- a/arch/sparc64/math-emu/math.c
+++ b/arch/sparc64/math-emu/math.c
@@ -88,7 +88,7 @@
 #define FSR_CEXC_MASK	(0x1fUL << FSR_CEXC_SHIFT)
 
 /* All routines returning an exception to raise should detect
- * such exceptions _before_ rounding to be consistant with
+ * such exceptions _before_ rounding to be consistent with
  * the behavior of the hardware in the implemented cases
  * (and thus with the recommendations in the V9 architecture
  * manual).
diff --git a/arch/v850/kernel/rte_mb_a_pci.c b/arch/v850/kernel/rte_mb_a_pci.c
index c56b0d28bb98..6fc07ccd955e 100644
--- a/arch/v850/kernel/rte_mb_a_pci.c
+++ b/arch/v850/kernel/rte_mb_a_pci.c
@@ -689,7 +689,7 @@ void pci_unmap_single (struct pci_dev *pdev, dma_addr_t dma_addr, size_t size,
 	free_dma_mapping (mapping);
 }
 
-/* Make physical memory consistant for a single streaming mode DMA
+/* Make physical memory consistent for a single streaming mode DMA
    translation after a transfer.
 
    If you perform a pci_map_single() but wish to interrogate the
@@ -731,7 +731,7 @@ pci_unmap_sg (struct pci_dev *pdev, struct scatterlist *sg, int sg_len,int dir)
 	BUG ();
 }
 
-/* Make physical memory consistant for a set of streaming mode DMA
+/* Make physical memory consistent for a set of streaming mode DMA
    translations after a transfer.  The same as pci_dma_sync_single but
    for a scatter-gather list, same rules and usage.  */