aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2011-03-30 21:57:33 -0400
committerLucas De Marchi <lucas.demarchi@profusion.mobi>2011-03-31 10:26:23 -0400
commit25985edcedea6396277003854657b5f3cb31a628 (patch)
treef026e810210a2ee7290caeb737c23cb6472b7c38 /arch/cris
parent6aba74f2791287ec407e0f92487a725a25908067 (diff)
Fix common misspellings
Fixes generated by 'codespell' and manually reviewed. Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/arch-v10/README.mm2
-rw-r--r--arch/cris/arch-v10/drivers/sync_serial.c2
-rw-r--r--arch/cris/arch-v32/drivers/axisflashmap.c2
-rw-r--r--arch/cris/arch-v32/drivers/mach-a3/nandflash.c2
-rw-r--r--arch/cris/arch-v32/drivers/mach-fs/nandflash.c2
-rw-r--r--arch/cris/arch-v32/drivers/sync_serial.c2
-rw-r--r--arch/cris/arch-v32/kernel/entry.S2
-rw-r--r--arch/cris/arch-v32/kernel/irq.c2
-rw-r--r--arch/cris/arch-v32/kernel/kgdb.c2
-rw-r--r--arch/cris/arch-v32/kernel/process.c2
-rw-r--r--arch/cris/arch-v32/kernel/signal.c2
-rw-r--r--arch/cris/arch-v32/mach-a3/arbiter.c4
-rw-r--r--arch/cris/arch-v32/mach-fs/arbiter.c2
-rw-r--r--arch/cris/boot/rescue/head_v10.S2
-rw-r--r--arch/cris/include/arch-v32/arch/hwregs/Makefile2
-rw-r--r--arch/cris/include/arch-v32/arch/hwregs/iop/Makefile2
-rw-r--r--arch/cris/include/asm/pgtable.h2
-rw-r--r--arch/cris/kernel/traps.c2
18 files changed, 19 insertions, 19 deletions
diff --git a/arch/cris/arch-v10/README.mm b/arch/cris/arch-v10/README.mm
index 517d1f027fe..67731d75cb5 100644
--- a/arch/cris/arch-v10/README.mm
+++ b/arch/cris/arch-v10/README.mm
@@ -38,7 +38,7 @@ space. We also use it to keep the user-mode virtual mapping in the same
38map during kernel-mode, so that the kernel easily can access the corresponding 38map during kernel-mode, so that the kernel easily can access the corresponding
39user-mode process' data. 39user-mode process' data.
40 40
41As a comparision, the Linux/i386 2.0 puts the kernel and physical RAM at 41As a comparison, the Linux/i386 2.0 puts the kernel and physical RAM at
42address 0, overlapping with the user-mode virtual space, so that descriptor 42address 0, overlapping with the user-mode virtual space, so that descriptor
43registers are needed for each memory access to specify which MMU space to 43registers are needed for each memory access to specify which MMU space to
44map through. That changed in 2.2, putting the kernel/physical RAM at 44map through. That changed in 2.2, putting the kernel/physical RAM at
diff --git a/arch/cris/arch-v10/drivers/sync_serial.c b/arch/cris/arch-v10/drivers/sync_serial.c
index 399dc1ec8e6..85026537361 100644
--- a/arch/cris/arch-v10/drivers/sync_serial.c
+++ b/arch/cris/arch-v10/drivers/sync_serial.c
@@ -31,7 +31,7 @@
31#include <asm/sync_serial.h> 31#include <asm/sync_serial.h>
32#include <arch/io_interface_mux.h> 32#include <arch/io_interface_mux.h>
33 33
34/* The receiver is a bit tricky beacuse of the continuous stream of data.*/ 34/* The receiver is a bit tricky because of the continuous stream of data.*/
35/* */ 35/* */
36/* Three DMA descriptors are linked together. Each DMA descriptor is */ 36/* Three DMA descriptors are linked together. Each DMA descriptor is */
37/* responsible for port->bufchunk of a common buffer. */ 37/* responsible for port->bufchunk of a common buffer. */
diff --git a/arch/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c
index 3d751250271..7b155f8203b 100644
--- a/arch/cris/arch-v32/drivers/axisflashmap.c
+++ b/arch/cris/arch-v32/drivers/axisflashmap.c
@@ -215,7 +215,7 @@ static struct mtd_partition main_partition = {
215}; 215};
216#endif 216#endif
217 217
218/* Auxilliary partition if we find another flash */ 218/* Auxiliary partition if we find another flash */
219static struct mtd_partition aux_partition = { 219static struct mtd_partition aux_partition = {
220 .name = "aux", 220 .name = "aux",
221 .size = 0, 221 .size = 0,
diff --git a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
index 25d6f2b3a72..f58f2c1c529 100644
--- a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
+++ b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
@@ -165,7 +165,7 @@ struct mtd_info *__init crisv32_nand_flash_probe(void)
165 /* Enable the following for a flash based bad block table */ 165 /* Enable the following for a flash based bad block table */
166 /* this->options = NAND_USE_FLASH_BBT; */ 166 /* this->options = NAND_USE_FLASH_BBT; */
167 167
168 /* Scan to find existance of the device */ 168 /* Scan to find existence of the device */
169 if (nand_scan(crisv32_mtd, 1)) { 169 if (nand_scan(crisv32_mtd, 1)) {
170 err = -ENXIO; 170 err = -ENXIO;
171 goto out_mtd; 171 goto out_mtd;
diff --git a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
index c5a0f54763c..d5b0cc9f976 100644
--- a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
+++ b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
@@ -156,7 +156,7 @@ struct mtd_info *__init crisv32_nand_flash_probe(void)
156 /* Enable the following for a flash based bad block table */ 156 /* Enable the following for a flash based bad block table */
157 /* this->options = NAND_USE_FLASH_BBT; */ 157 /* this->options = NAND_USE_FLASH_BBT; */
158 158
159 /* Scan to find existance of the device */ 159 /* Scan to find existence of the device */
160 if (nand_scan(crisv32_mtd, 1)) { 160 if (nand_scan(crisv32_mtd, 1)) {
161 err = -ENXIO; 161 err = -ENXIO;
162 goto out_ior; 162 goto out_ior;
diff --git a/arch/cris/arch-v32/drivers/sync_serial.c b/arch/cris/arch-v32/drivers/sync_serial.c
index c8637a9195e..a6a180bc566 100644
--- a/arch/cris/arch-v32/drivers/sync_serial.c
+++ b/arch/cris/arch-v32/drivers/sync_serial.c
@@ -33,7 +33,7 @@
33#include <asm/sync_serial.h> 33#include <asm/sync_serial.h>
34 34
35 35
36/* The receiver is a bit tricky beacuse of the continuous stream of data.*/ 36/* The receiver is a bit tricky because of the continuous stream of data.*/
37/* */ 37/* */
38/* Three DMA descriptors are linked together. Each DMA descriptor is */ 38/* Three DMA descriptors are linked together. Each DMA descriptor is */
39/* responsible for port->bufchunk of a common buffer. */ 39/* responsible for port->bufchunk of a common buffer. */
diff --git a/arch/cris/arch-v32/kernel/entry.S b/arch/cris/arch-v32/kernel/entry.S
index 0ecb50b8f0d..3abf12c23e5 100644
--- a/arch/cris/arch-v32/kernel/entry.S
+++ b/arch/cris/arch-v32/kernel/entry.S
@@ -182,7 +182,7 @@ _syscall_traced:
182 move.d $r0, [$sp] 182 move.d $r0, [$sp]
183 183
184 ;; The registers carrying parameters (R10-R13) are intact. The optional 184 ;; The registers carrying parameters (R10-R13) are intact. The optional
185 ;; fifth and sixth parameters is in MOF and SRP respectivly. Put them 185 ;; fifth and sixth parameters is in MOF and SRP respectively. Put them
186 ;; back on the stack. 186 ;; back on the stack.
187 subq 4, $sp 187 subq 4, $sp
188 move $srp, [$sp] 188 move $srp, [$sp]
diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c
index 8023176e19b..68a1a5901ca 100644
--- a/arch/cris/arch-v32/kernel/irq.c
+++ b/arch/cris/arch-v32/kernel/irq.c
@@ -374,7 +374,7 @@ crisv32_do_multiple(struct pt_regs* regs)
374 irq_enter(); 374 irq_enter();
375 375
376 for (i = 0; i < NBR_REGS; i++) { 376 for (i = 0; i < NBR_REGS; i++) {
377 /* Get which IRQs that happend. */ 377 /* Get which IRQs that happened. */
378 masked[i] = REG_RD_INT_VECT(intr_vect, irq_regs[cpu], 378 masked[i] = REG_RD_INT_VECT(intr_vect, irq_regs[cpu],
379 r_masked_vect, i); 379 r_masked_vect, i);
380 380
diff --git a/arch/cris/arch-v32/kernel/kgdb.c b/arch/cris/arch-v32/kernel/kgdb.c
index 6b653323d79..c0343c3ea7f 100644
--- a/arch/cris/arch-v32/kernel/kgdb.c
+++ b/arch/cris/arch-v32/kernel/kgdb.c
@@ -925,7 +925,7 @@ stub_is_stopped(int sigval)
925 925
926 if (reg.eda >= bp_d_regs[bp * 2] && 926 if (reg.eda >= bp_d_regs[bp * 2] &&
927 reg.eda <= bp_d_regs[bp * 2 + 1]) { 927 reg.eda <= bp_d_regs[bp * 2 + 1]) {
928 /* EDA withing range for this BP; it must be the one 928 /* EDA within range for this BP; it must be the one
929 we're looking for. */ 929 we're looking for. */
930 stopped_data_address = reg.eda; 930 stopped_data_address = reg.eda;
931 break; 931 break;
diff --git a/arch/cris/arch-v32/kernel/process.c b/arch/cris/arch-v32/kernel/process.c
index 562f8471890..0570e8ce603 100644
--- a/arch/cris/arch-v32/kernel/process.c
+++ b/arch/cris/arch-v32/kernel/process.c
@@ -149,7 +149,7 @@ copy_thread(unsigned long clone_flags, unsigned long usp,
149 childregs->r10 = 0; /* Child returns 0 after a fork/clone. */ 149 childregs->r10 = 0; /* Child returns 0 after a fork/clone. */
150 150
151 /* Set a new TLS ? 151 /* Set a new TLS ?
152 * The TLS is in $mof beacuse it is the 5th argument to sys_clone. 152 * The TLS is in $mof because it is the 5th argument to sys_clone.
153 */ 153 */
154 if (p->mm && (clone_flags & CLONE_SETTLS)) { 154 if (p->mm && (clone_flags & CLONE_SETTLS)) {
155 task_thread_info(p)->tls = regs->mof; 155 task_thread_info(p)->tls = regs->mof;
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c
index b3a05ae5621..ce4ab1a5552 100644
--- a/arch/cris/arch-v32/kernel/signal.c
+++ b/arch/cris/arch-v32/kernel/signal.c
@@ -610,7 +610,7 @@ ugdb_trap_user(struct thread_info *ti, int sig)
610 user_regs(ti)->spc = 0; 610 user_regs(ti)->spc = 0;
611 } 611 }
612 /* FIXME: Filter out false h/w breakpoint hits (i.e. EDA 612 /* FIXME: Filter out false h/w breakpoint hits (i.e. EDA
613 not withing any configured h/w breakpoint range). Synchronize with 613 not within any configured h/w breakpoint range). Synchronize with
614 what already exists for kernel debugging. */ 614 what already exists for kernel debugging. */
615 if (((user_regs(ti)->exs & 0xff00) >> 8) == BREAK_8_INTR_VECT) { 615 if (((user_regs(ti)->exs & 0xff00) >> 8) == BREAK_8_INTR_VECT) {
616 /* Break 8: subtract 2 from ERP unless in a delay slot. */ 616 /* Break 8: subtract 2 from ERP unless in a delay slot. */
diff --git a/arch/cris/arch-v32/mach-a3/arbiter.c b/arch/cris/arch-v32/mach-a3/arbiter.c
index 8b924db71c9..15f5c9de263 100644
--- a/arch/cris/arch-v32/mach-a3/arbiter.c
+++ b/arch/cris/arch-v32/mach-a3/arbiter.c
@@ -568,7 +568,7 @@ crisv32_foo_arbiter_irq(int irq, void *dev_id)
568 REG_WR(marb_foo_bp, watch->instance, rw_ack, ack); 568 REG_WR(marb_foo_bp, watch->instance, rw_ack, ack);
569 REG_WR(marb_foo, regi_marb_foo, rw_ack_intr, ack_intr); 569 REG_WR(marb_foo, regi_marb_foo, rw_ack_intr, ack_intr);
570 570
571 printk(KERN_DEBUG "IRQ occured at %X\n", (unsigned)get_irq_regs()); 571 printk(KERN_DEBUG "IRQ occurred at %X\n", (unsigned)get_irq_regs());
572 572
573 if (watch->cb) 573 if (watch->cb)
574 watch->cb(); 574 watch->cb();
@@ -624,7 +624,7 @@ crisv32_bar_arbiter_irq(int irq, void *dev_id)
624 REG_WR(marb_bar_bp, watch->instance, rw_ack, ack); 624 REG_WR(marb_bar_bp, watch->instance, rw_ack, ack);
625 REG_WR(marb_bar, regi_marb_bar, rw_ack_intr, ack_intr); 625 REG_WR(marb_bar, regi_marb_bar, rw_ack_intr, ack_intr);
626 626
627 printk(KERN_DEBUG "IRQ occured at %X\n", (unsigned)get_irq_regs()->erp); 627 printk(KERN_DEBUG "IRQ occurred at %X\n", (unsigned)get_irq_regs()->erp);
628 628
629 if (watch->cb) 629 if (watch->cb)
630 watch->cb(); 630 watch->cb();
diff --git a/arch/cris/arch-v32/mach-fs/arbiter.c b/arch/cris/arch-v32/mach-fs/arbiter.c
index 82ef293c4c8..3f8ebb5c147 100644
--- a/arch/cris/arch-v32/mach-fs/arbiter.c
+++ b/arch/cris/arch-v32/mach-fs/arbiter.c
@@ -395,7 +395,7 @@ static irqreturn_t crisv32_arbiter_irq(int irq, void *dev_id)
395 REG_WR(marb_bp, watch->instance, rw_ack, ack); 395 REG_WR(marb_bp, watch->instance, rw_ack, ack);
396 REG_WR(marb, regi_marb, rw_ack_intr, ack_intr); 396 REG_WR(marb, regi_marb, rw_ack_intr, ack_intr);
397 397
398 printk(KERN_INFO "IRQ occured at %lX\n", get_irq_regs()->erp); 398 printk(KERN_INFO "IRQ occurred at %lX\n", get_irq_regs()->erp);
399 399
400 if (watch->cb) 400 if (watch->cb)
401 watch->cb(); 401 watch->cb();
diff --git a/arch/cris/boot/rescue/head_v10.S b/arch/cris/boot/rescue/head_v10.S
index 2fafe247a25..af55df0994b 100644
--- a/arch/cris/boot/rescue/head_v10.S
+++ b/arch/cris/boot/rescue/head_v10.S
@@ -7,7 +7,7 @@
7 * for each partition that this code should check. 7 * for each partition that this code should check.
8 * 8 *
9 * If any of the checksums fail, we assume the flash is so 9 * If any of the checksums fail, we assume the flash is so
10 * corrupt that we cant use it to boot into the ftp flash 10 * corrupt that we can't use it to boot into the ftp flash
11 * loader, and instead we initialize the serial port to 11 * loader, and instead we initialize the serial port to
12 * receive a flash-loader and new flash image. we dont include 12 * receive a flash-loader and new flash image. we dont include
13 * any flash code here, but just accept a certain amount of 13 * any flash code here, but just accept a certain amount of
diff --git a/arch/cris/include/arch-v32/arch/hwregs/Makefile b/arch/cris/include/arch-v32/arch/hwregs/Makefile
index f9a05d2aa06..b8b3f8d666e 100644
--- a/arch/cris/include/arch-v32/arch/hwregs/Makefile
+++ b/arch/cris/include/arch-v32/arch/hwregs/Makefile
@@ -1,6 +1,6 @@
1# Makefile to generate or copy the latest register definitions 1# Makefile to generate or copy the latest register definitions
2# and related datastructures and helpermacros. 2# and related datastructures and helpermacros.
3# The offical place for these files is at: 3# The official place for these files is at:
4RELEASE ?= r1_alfa5 4RELEASE ?= r1_alfa5
5OFFICIAL_INCDIR = /n/asic/projects/guinness/releases/$(RELEASE)/design/top/sw/include/ 5OFFICIAL_INCDIR = /n/asic/projects/guinness/releases/$(RELEASE)/design/top/sw/include/
6 6
diff --git a/arch/cris/include/arch-v32/arch/hwregs/iop/Makefile b/arch/cris/include/arch-v32/arch/hwregs/iop/Makefile
index a90056a095e..0747a22e3c0 100644
--- a/arch/cris/include/arch-v32/arch/hwregs/iop/Makefile
+++ b/arch/cris/include/arch-v32/arch/hwregs/iop/Makefile
@@ -1,7 +1,7 @@
1# $Id: Makefile,v 1.3 2004/01/07 20:34:55 johana Exp $ 1# $Id: Makefile,v 1.3 2004/01/07 20:34:55 johana Exp $
2# Makefile to generate or copy the latest register definitions 2# Makefile to generate or copy the latest register definitions
3# and related datastructures and helpermacros. 3# and related datastructures and helpermacros.
4# The offical place for these files is probably at: 4# The official place for these files is probably at:
5RELEASE ?= r1_alfa5 5RELEASE ?= r1_alfa5
6IOPOFFICIAL_INCDIR = /n/asic/projects/guinness/releases/$(RELEASE)/design/top/sw/include/ 6IOPOFFICIAL_INCDIR = /n/asic/projects/guinness/releases/$(RELEASE)/design/top/sw/include/
7 7
diff --git a/arch/cris/include/asm/pgtable.h b/arch/cris/include/asm/pgtable.h
index 9eaae217b21..7df43013835 100644
--- a/arch/cris/include/asm/pgtable.h
+++ b/arch/cris/include/asm/pgtable.h
@@ -97,7 +97,7 @@ extern unsigned long empty_zero_page;
97#define pte_clear(mm,addr,xp) do { pte_val(*(xp)) = 0; } while (0) 97#define pte_clear(mm,addr,xp) do { pte_val(*(xp)) = 0; } while (0)
98 98
99#define pmd_none(x) (!pmd_val(x)) 99#define pmd_none(x) (!pmd_val(x))
100/* by removing the _PAGE_KERNEL bit from the comparision, the same pmd_bad 100/* by removing the _PAGE_KERNEL bit from the comparison, the same pmd_bad
101 * works for both _PAGE_TABLE and _KERNPG_TABLE pmd entries. 101 * works for both _PAGE_TABLE and _KERNPG_TABLE pmd entries.
102 */ 102 */
103#define pmd_bad(x) ((pmd_val(x) & (~PAGE_MASK & ~_PAGE_KERNEL)) != _PAGE_TABLE) 103#define pmd_bad(x) ((pmd_val(x) & (~PAGE_MASK & ~_PAGE_KERNEL)) != _PAGE_TABLE)
diff --git a/arch/cris/kernel/traps.c b/arch/cris/kernel/traps.c
index 541efbf0937..8da53f34c7a 100644
--- a/arch/cris/kernel/traps.c
+++ b/arch/cris/kernel/traps.c
@@ -183,7 +183,7 @@ __initcall(oops_nmi_register);
183 183
184/* 184/*
185 * This gets called from entry.S when the watchdog has bitten. Show something 185 * This gets called from entry.S when the watchdog has bitten. Show something
186 * similiar to an Oops dump, and if the kernel is configured to be a nice 186 * similar to an Oops dump, and if the kernel is configured to be a nice
187 * doggy, then halt instead of reboot. 187 * doggy, then halt instead of reboot.
188 */ 188 */
189void 189void