diff options
Diffstat (limited to 'arch/blackfin')
-rw-r--r-- | arch/blackfin/Kconfig.debug | 2 | ||||
-rw-r--r-- | arch/blackfin/include/asm/traps.h | 2 | ||||
-rw-r--r-- | arch/blackfin/kernel/kgdb.c | 2 | ||||
-rw-r--r-- | arch/blackfin/kernel/traps.c | 2 | ||||
-rw-r--r-- | arch/blackfin/lib/ins.S | 2 | ||||
-rw-r--r-- | arch/blackfin/lib/memmove.S | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-common/entry.S | 4 | ||||
-rw-r--r-- | arch/blackfin/mach-common/head.S | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/arch/blackfin/Kconfig.debug b/arch/blackfin/Kconfig.debug index acb83799a215..2641731f24cd 100644 --- a/arch/blackfin/Kconfig.debug +++ b/arch/blackfin/Kconfig.debug | |||
@@ -59,7 +59,7 @@ config EXACT_HWERR | |||
59 | be reported multiple cycles after the error happens. This delay | 59 | be reported multiple cycles after the error happens. This delay |
60 | can cause the wrong application, or even the kernel to receive a | 60 | can cause the wrong application, or even the kernel to receive a |
61 | signal to be killed. If you are getting HW errors in your system, | 61 | signal to be killed. If you are getting HW errors in your system, |
62 | try turning this on to ensure they are at least comming from the | 62 | try turning this on to ensure they are at least coming from the |
63 | proper thread. | 63 | proper thread. |
64 | 64 | ||
65 | On production systems, it is safe (and a small optimization) to say N. | 65 | On production systems, it is safe (and a small optimization) to say N. |
diff --git a/arch/blackfin/include/asm/traps.h b/arch/blackfin/include/asm/traps.h index 9fe0da612c09..70c4e511cae6 100644 --- a/arch/blackfin/include/asm/traps.h +++ b/arch/blackfin/include/asm/traps.h | |||
@@ -57,7 +57,7 @@ | |||
57 | #define HWC_x3(level) \ | 57 | #define HWC_x3(level) \ |
58 | "External Memory Addressing Error\n" | 58 | "External Memory Addressing Error\n" |
59 | #define EXC_0x04(level) \ | 59 | #define EXC_0x04(level) \ |
60 | "Unimplmented exception occured\n" \ | 60 | "Unimplmented exception occurred\n" \ |
61 | level " - Maybe you forgot to install a custom exception handler?\n" | 61 | level " - Maybe you forgot to install a custom exception handler?\n" |
62 | #define HWC_x12(level) \ | 62 | #define HWC_x12(level) \ |
63 | "Performance Monitor Overflow\n" | 63 | "Performance Monitor Overflow\n" |
diff --git a/arch/blackfin/kernel/kgdb.c b/arch/blackfin/kernel/kgdb.c index b8cfe34989e4..9b80b152435e 100644 --- a/arch/blackfin/kernel/kgdb.c +++ b/arch/blackfin/kernel/kgdb.c | |||
@@ -181,7 +181,7 @@ static int bfin_set_hw_break(unsigned long addr, int len, enum kgdb_bptype type) | |||
181 | return -ENOSPC; | 181 | return -ENOSPC; |
182 | } | 182 | } |
183 | 183 | ||
184 | /* Becasue hardware data watchpoint impelemented in current | 184 | /* Because hardware data watchpoint impelemented in current |
185 | * Blackfin can not trigger an exception event as the hardware | 185 | * Blackfin can not trigger an exception event as the hardware |
186 | * instrction watchpoint does, we ignaore all data watch point here. | 186 | * instrction watchpoint does, we ignaore all data watch point here. |
187 | * They can be turned on easily after future blackfin design | 187 | * They can be turned on easily after future blackfin design |
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c index 59c1df75e4de..655f25d139a7 100644 --- a/arch/blackfin/kernel/traps.c +++ b/arch/blackfin/kernel/traps.c | |||
@@ -98,7 +98,7 @@ asmlinkage notrace void trap_c(struct pt_regs *fp) | |||
98 | /* send the appropriate signal to the user program */ | 98 | /* send the appropriate signal to the user program */ |
99 | switch (trapnr) { | 99 | switch (trapnr) { |
100 | 100 | ||
101 | /* This table works in conjuction with the one in ./mach-common/entry.S | 101 | /* This table works in conjunction with the one in ./mach-common/entry.S |
102 | * Some exceptions are handled there (in assembly, in exception space) | 102 | * Some exceptions are handled there (in assembly, in exception space) |
103 | * Some are handled here, (in C, in interrupt space) | 103 | * Some are handled here, (in C, in interrupt space) |
104 | * Some, like CPLB, are handled in both, where the normal path is | 104 | * Some, like CPLB, are handled in both, where the normal path is |
diff --git a/arch/blackfin/lib/ins.S b/arch/blackfin/lib/ins.S index 3edbd8db6598..79caccea85ca 100644 --- a/arch/blackfin/lib/ins.S +++ b/arch/blackfin/lib/ins.S | |||
@@ -67,7 +67,7 @@ | |||
67 | * - DMA version, which do not suffer from this issue. DMA versions have | 67 | * - DMA version, which do not suffer from this issue. DMA versions have |
68 | * different name (prefixed by dma_ ), and are located in | 68 | * different name (prefixed by dma_ ), and are located in |
69 | * ../kernel/bfin_dma_5xx.c | 69 | * ../kernel/bfin_dma_5xx.c |
70 | * Using the dma related functions are recommended for transfering large | 70 | * Using the dma related functions are recommended for transferring large |
71 | * buffers in/out of FIFOs. | 71 | * buffers in/out of FIFOs. |
72 | */ | 72 | */ |
73 | 73 | ||
diff --git a/arch/blackfin/lib/memmove.S b/arch/blackfin/lib/memmove.S index 80c240acac60..4eca566237a4 100644 --- a/arch/blackfin/lib/memmove.S +++ b/arch/blackfin/lib/memmove.S | |||
@@ -60,7 +60,7 @@ ENTRY(_memmove) | |||
60 | [P0++] = R1; | 60 | [P0++] = R1; |
61 | 61 | ||
62 | CC = P2 == 0; /* any remaining bytes? */ | 62 | CC = P2 == 0; /* any remaining bytes? */ |
63 | P3 = I0; /* Ammend P3 to updated ptr. */ | 63 | P3 = I0; /* Amend P3 to updated ptr. */ |
64 | IF !CC JUMP .Lbytes; | 64 | IF !CC JUMP .Lbytes; |
65 | P3 = I1; | 65 | P3 = I1; |
66 | RTS; | 66 | RTS; |
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index 2c69785a7bbe..3fa335405b31 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
@@ -2530,7 +2530,7 @@ static struct resource bfin_pata_resources[] = { | |||
2530 | static struct pata_platform_info bfin_pata_platform_data = { | 2530 | static struct pata_platform_info bfin_pata_platform_data = { |
2531 | .ioport_shift = 0, | 2531 | .ioport_shift = 0, |
2532 | }; | 2532 | }; |
2533 | /* CompactFlash Storage Card Memory Mapped Adressing | 2533 | /* CompactFlash Storage Card Memory Mapped Addressing |
2534 | * /REG = A11 = 1 | 2534 | * /REG = A11 = 1 |
2535 | */ | 2535 | */ |
2536 | static struct resource bfin_pata_resources[] = { | 2536 | static struct resource bfin_pata_resources[] = { |
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S index 46ab45704c89..f96933f48a7f 100644 --- a/arch/blackfin/mach-common/entry.S +++ b/arch/blackfin/mach-common/entry.S | |||
@@ -268,7 +268,7 @@ ENTRY(_handle_bad_cplb) | |||
268 | /* To get here, we just tried and failed to change a CPLB | 268 | /* To get here, we just tried and failed to change a CPLB |
269 | * so, handle things in trap_c (C code), by lowering to | 269 | * so, handle things in trap_c (C code), by lowering to |
270 | * IRQ5, just like we normally do. Since this is not a | 270 | * IRQ5, just like we normally do. Since this is not a |
271 | * "normal" return path, we have a do alot of stuff to | 271 | * "normal" return path, we have a do a lot of stuff to |
272 | * the stack to get ready so, we can fall through - we | 272 | * the stack to get ready so, we can fall through - we |
273 | * need to make a CPLB exception look like a normal exception | 273 | * need to make a CPLB exception look like a normal exception |
274 | */ | 274 | */ |
@@ -817,7 +817,7 @@ _new_old_task: | |||
817 | rets = [sp++]; | 817 | rets = [sp++]; |
818 | 818 | ||
819 | /* | 819 | /* |
820 | * When we come out of resume, r0 carries "old" task, becuase we are | 820 | * When we come out of resume, r0 carries "old" task, because we are |
821 | * in "new" task. | 821 | * in "new" task. |
822 | */ | 822 | */ |
823 | rts; | 823 | rts; |
diff --git a/arch/blackfin/mach-common/head.S b/arch/blackfin/mach-common/head.S index 581e2b0a71ac..76de5724c1e3 100644 --- a/arch/blackfin/mach-common/head.S +++ b/arch/blackfin/mach-common/head.S | |||
@@ -174,7 +174,7 @@ ENTRY(__start) | |||
174 | sp.l = lo(KERNEL_CLOCK_STACK); | 174 | sp.l = lo(KERNEL_CLOCK_STACK); |
175 | sp.h = hi(KERNEL_CLOCK_STACK); | 175 | sp.h = hi(KERNEL_CLOCK_STACK); |
176 | call _init_clocks; | 176 | call _init_clocks; |
177 | sp = usp; /* usp hasnt been touched, so restore from there */ | 177 | sp = usp; /* usp hasn't been touched, so restore from there */ |
178 | #endif | 178 | #endif |
179 | 179 | ||
180 | /* This section keeps the processor in supervisor mode | 180 | /* This section keeps the processor in supervisor mode |