aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/cris/arch-v10/boot/compressed/misc.c2
-rw-r--r--arch/cris/arch-v10/kernel/debugport.c2
-rw-r--r--arch/cris/arch-v10/kernel/fasttimer.c2
-rw-r--r--arch/cris/arch-v10/kernel/irq.c2
-rw-r--r--arch/cris/arch-v10/kernel/process.c2
-rw-r--r--arch/cris/arch-v10/kernel/shadows.c2
-rw-r--r--arch/cris/arch-v10/lib/string.c2
-rw-r--r--arch/cris/arch-v10/lib/usercopy.c6
-rw-r--r--arch/cris/arch-v32/boot/compressed/misc.c6
-rw-r--r--arch/cris/arch-v32/drivers/axisflashmap.c2
-rw-r--r--arch/cris/arch-v32/drivers/i2c.c2
-rw-r--r--arch/cris/arch-v32/drivers/nandflash.c2
-rw-r--r--arch/cris/arch-v32/kernel/fasttimer.c2
-rw-r--r--arch/cris/arch-v32/kernel/irq.c8
-rw-r--r--arch/cris/arch-v32/kernel/process.c2
-rw-r--r--arch/cris/arch-v32/kernel/signal.c4
-rw-r--r--arch/cris/arch-v32/kernel/smp.c2
-rw-r--r--arch/cris/arch-v32/kernel/time.c2
-rw-r--r--arch/cris/arch-v32/kernel/traps.c2
-rw-r--r--arch/cris/arch-v32/lib/string.c2
-rw-r--r--arch/cris/arch-v32/lib/usercopy.c6
-rw-r--r--arch/cris/arch-v32/mm/tlb.c6
-rw-r--r--arch/cris/kernel/irq.c8
-rw-r--r--arch/cris/mm/fault.c4
-rw-r--r--arch/cris/mm/init.c2
-rw-r--r--arch/cris/mm/tlb.c2
26 files changed, 42 insertions, 42 deletions
diff --git a/arch/cris/arch-v10/boot/compressed/misc.c b/arch/cris/arch-v10/boot/compressed/misc.c
index ffb8d21b2f83..e205d2e7e089 100644
--- a/arch/cris/arch-v10/boot/compressed/misc.c
+++ b/arch/cris/arch-v10/boot/compressed/misc.c
@@ -8,7 +8,7 @@
8 * 8 *
9 * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994 9 * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994
10 * puts by Nick Holloway 1993, better puts by Martin Mares 1995 10 * puts by Nick Holloway 1993, better puts by Martin Mares 1995
11 * adoptation for Linux/CRIS Axis Communications AB, 1999 11 * adaptation for Linux/CRIS Axis Communications AB, 1999
12 * 12 *
13 */ 13 */
14 14
diff --git a/arch/cris/arch-v10/kernel/debugport.c b/arch/cris/arch-v10/kernel/debugport.c
index 2b536ca6f444..93679a48c791 100644
--- a/arch/cris/arch-v10/kernel/debugport.c
+++ b/arch/cris/arch-v10/kernel/debugport.c
@@ -83,7 +83,7 @@
83 * 83 *
84 * Revision 1.4 2002/11/19 14:35:24 starvik 84 * Revision 1.4 2002/11/19 14:35:24 starvik
85 * Changes from linux 2.4 85 * Changes from linux 2.4
86 * Changed struct initializer syntax to the currently prefered notation 86 * Changed struct initializer syntax to the currently preferred notation
87 * 87 *
88 * Revision 1.3 2002/11/06 09:47:03 starvik 88 * Revision 1.3 2002/11/06 09:47:03 starvik
89 * Modified for new interrupt macros 89 * Modified for new interrupt macros
diff --git a/arch/cris/arch-v10/kernel/fasttimer.c b/arch/cris/arch-v10/kernel/fasttimer.c
index 8cbdf594b369..d3ea052e5ee1 100644
--- a/arch/cris/arch-v10/kernel/fasttimer.c
+++ b/arch/cris/arch-v10/kernel/fasttimer.c
@@ -84,7 +84,7 @@
84 * with time based on jiffies and *R_TIMER0_DATA, uses a table 84 * with time based on jiffies and *R_TIMER0_DATA, uses a table
85 * for fast conversion of timer value to microseconds. 85 * for fast conversion of timer value to microseconds.
86 * (Much faster the standard do_gettimeofday() and we don't really 86 * (Much faster the standard do_gettimeofday() and we don't really
87 * wan't to use the true time - we wan't the "uptime" so timers don't screw up 87 * want to use the true time - we want the "uptime" so timers don't screw up
88 * when we change the time. 88 * when we change the time.
89 * TODO: Add efficient support for continuous timers as well. 89 * TODO: Add efficient support for continuous timers as well.
90 * 90 *
diff --git a/arch/cris/arch-v10/kernel/irq.c b/arch/cris/arch-v10/kernel/irq.c
index 96094cbf1255..845c95f6e871 100644
--- a/arch/cris/arch-v10/kernel/irq.c
+++ b/arch/cris/arch-v10/kernel/irq.c
@@ -169,7 +169,7 @@ init_IRQ(void)
169 for (i = 0; i < 256; i++) 169 for (i = 0; i < 256; i++)
170 etrax_irv->v[i] = weird_irq; 170 etrax_irv->v[i] = weird_irq;
171 171
172 /* Initialize IRQ handler descriptiors. */ 172 /* Initialize IRQ handler descriptors. */
173 for(i = 2; i < NR_IRQS; i++) { 173 for(i = 2; i < NR_IRQS; i++) {
174 irq_desc[i].chip = &crisv10_irq_type; 174 irq_desc[i].chip = &crisv10_irq_type;
175 set_int_vector(i, interrupt[i]); 175 set_int_vector(i, interrupt[i]);
diff --git a/arch/cris/arch-v10/kernel/process.c b/arch/cris/arch-v10/kernel/process.c
index b6831ceb6a62..1a3760c94f85 100644
--- a/arch/cris/arch-v10/kernel/process.c
+++ b/arch/cris/arch-v10/kernel/process.c
@@ -64,7 +64,7 @@ void hard_reset_now (void)
64#if defined(CONFIG_ETRAX_WATCHDOG) && !defined(CONFIG_SVINTO_SIM) 64#if defined(CONFIG_ETRAX_WATCHDOG) && !defined(CONFIG_SVINTO_SIM)
65 cause_of_death = 0xbedead; 65 cause_of_death = 0xbedead;
66#else 66#else
67 /* Since we dont plan to keep on reseting the watchdog, 67 /* Since we dont plan to keep on resetting the watchdog,
68 the key can be arbitrary hence three */ 68 the key can be arbitrary hence three */
69 *R_WATCHDOG = IO_FIELD(R_WATCHDOG, key, 3) | 69 *R_WATCHDOG = IO_FIELD(R_WATCHDOG, key, 3) |
70 IO_STATE(R_WATCHDOG, enable, start); 70 IO_STATE(R_WATCHDOG, enable, start);
diff --git a/arch/cris/arch-v10/kernel/shadows.c b/arch/cris/arch-v10/kernel/shadows.c
index 38fd44dfbc5b..326178aef6ee 100644
--- a/arch/cris/arch-v10/kernel/shadows.c
+++ b/arch/cris/arch-v10/kernel/shadows.c
@@ -20,7 +20,7 @@ unsigned long r_timer_ctrl_shadow;
20 * These are only usable if there actually IS a latch connected 20 * These are only usable if there actually IS a latch connected
21 * to the corresponding external chip-select pin. 21 * to the corresponding external chip-select pin.
22 * 22 *
23 * A common usage is that CSP0 controls LED's and CSP4 video chips. 23 * A common usage is that CSP0 controls LEDs and CSP4 video chips.
24 */ 24 */
25 25
26unsigned long port_cse1_shadow; 26unsigned long port_cse1_shadow;
diff --git a/arch/cris/arch-v10/lib/string.c b/arch/cris/arch-v10/lib/string.c
index 8ffde4901b57..15d6662b03b1 100644
--- a/arch/cris/arch-v10/lib/string.c
+++ b/arch/cris/arch-v10/lib/string.c
@@ -41,7 +41,7 @@ void *memcpy(void *pdst,
41 Make sure the compiler is able to make something useful of this. 41 Make sure the compiler is able to make something useful of this.
42 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop). 42 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop).
43 43
44 If gcc was allright, it really would need no temporaries, and no 44 If gcc was alright, it really would need no temporaries, and no
45 stack space to save stuff on. */ 45 stack space to save stuff on. */
46 46
47 register void *return_dst __asm__ ("r10") = pdst; 47 register void *return_dst __asm__ ("r10") = pdst;
diff --git a/arch/cris/arch-v10/lib/usercopy.c b/arch/cris/arch-v10/lib/usercopy.c
index 43778d53c254..a12c708afc9a 100644
--- a/arch/cris/arch-v10/lib/usercopy.c
+++ b/arch/cris/arch-v10/lib/usercopy.c
@@ -38,7 +38,7 @@ __copy_user (void __user *pdst, const void *psrc, unsigned long pn)
38 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop). 38 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop).
39 39
40 FIXME: Comment for old gcc version. Check. 40 FIXME: Comment for old gcc version. Check.
41 If gcc was allright, it really would need no temporaries, and no 41 If gcc was alright, it really would need no temporaries, and no
42 stack space to save stuff on. */ 42 stack space to save stuff on. */
43 43
44 register char *dst __asm__ ("r13") = pdst; 44 register char *dst __asm__ ("r13") = pdst;
@@ -200,7 +200,7 @@ __copy_user_zeroing (void __user *pdst, const void *psrc, unsigned long pn)
200 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop). 200 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop).
201 201
202 FIXME: Comment for old gcc version. Check. 202 FIXME: Comment for old gcc version. Check.
203 If gcc was allright, it really would need no temporaries, and no 203 If gcc was alright, it really would need no temporaries, and no
204 stack space to save stuff on. */ 204 stack space to save stuff on. */
205 205
206 register char *dst __asm__ ("r13") = pdst; 206 register char *dst __asm__ ("r13") = pdst;
@@ -380,7 +380,7 @@ __do_clear_user (void __user *pto, unsigned long pn)
380 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop). 380 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop).
381 381
382 FIXME: Comment for old gcc version. Check. 382 FIXME: Comment for old gcc version. Check.
383 If gcc was allright, it really would need no temporaries, and no 383 If gcc was alright, it really would need no temporaries, and no
384 stack space to save stuff on. */ 384 stack space to save stuff on. */
385 385
386 register char *dst __asm__ ("r13") = pto; 386 register char *dst __asm__ ("r13") = pto;
diff --git a/arch/cris/arch-v32/boot/compressed/misc.c b/arch/cris/arch-v32/boot/compressed/misc.c
index 11902697196d..0169ba1ca9c9 100644
--- a/arch/cris/arch-v32/boot/compressed/misc.c
+++ b/arch/cris/arch-v32/boot/compressed/misc.c
@@ -8,7 +8,7 @@
8 * 8 *
9 * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994 9 * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994
10 * puts by Nick Holloway 1993, better puts by Martin Mares 1995 10 * puts by Nick Holloway 1993, better puts by Martin Mares 1995
11 * adoptation for Linux/CRIS Axis Communications AB, 1999 11 * adaptation for Linux/CRIS Axis Communications AB, 1999
12 * 12 *
13 */ 13 */
14 14
@@ -151,7 +151,7 @@ serout(const char *s, reg_scope_instances regi_ser)
151 do { 151 do {
152 rs = REG_RD(ser, regi_ser, rs_stat_din); 152 rs = REG_RD(ser, regi_ser, rs_stat_din);
153 } 153 }
154 while (!rs.tr_rdy);/* Wait for tranceiver. */ 154 while (!rs.tr_rdy);/* Wait for transceiver. */
155 155
156 REG_WR(ser, regi_ser, rw_dout, dout); 156 REG_WR(ser, regi_ser, rw_dout, dout);
157} 157}
@@ -264,7 +264,7 @@ serial_setup(reg_scope_instances regi_ser)
264 tr_ctrl.stop_bits = 1; /* 2 stop bits. */ 264 tr_ctrl.stop_bits = 1; /* 2 stop bits. */
265 265
266 /* 266 /*
267 * The baudrate setup is a bit fishy, but in the end the tranceiver is 267 * The baudrate setup is a bit fishy, but in the end the transceiver is
268 * set to 4800 and the receiver to 115200. The magic value is 268 * set to 4800 and the receiver to 115200. The magic value is
269 * 29.493 MHz. 269 * 29.493 MHz.
270 */ 270 */
diff --git a/arch/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c
index 5180d45412fc..3ec12ea44e8e 100644
--- a/arch/cris/arch-v32/drivers/axisflashmap.c
+++ b/arch/cris/arch-v32/drivers/axisflashmap.c
@@ -205,7 +205,7 @@ static struct mtd_info *probe_cs(struct map_info *map_cs)
205/* 205/*
206 * Probe each chip select individually for flash chips. If there are chips on 206 * Probe each chip select individually for flash chips. If there are chips on
207 * both cse0 and cse1, the mtd_info structs will be concatenated to one struct 207 * both cse0 and cse1, the mtd_info structs will be concatenated to one struct
208 * so that MTD partitions can cross chip boundries. 208 * so that MTD partitions can cross chip boundaries.
209 * 209 *
210 * The only known restriction to how you can mount your chips is that each 210 * The only known restriction to how you can mount your chips is that each
211 * chip select must hold similar flash chips. But you need external hardware 211 * chip select must hold similar flash chips. But you need external hardware
diff --git a/arch/cris/arch-v32/drivers/i2c.c b/arch/cris/arch-v32/drivers/i2c.c
index e12f6cc6f4a2..f1edd2e359b2 100644
--- a/arch/cris/arch-v32/drivers/i2c.c
+++ b/arch/cris/arch-v32/drivers/i2c.c
@@ -275,7 +275,7 @@ i2c_getack(void)
275 ack = 0; 275 ack = 0;
276 i2c_delay(CLOCK_HIGH_TIME/2); 276 i2c_delay(CLOCK_HIGH_TIME/2);
277 if(!ack){ 277 if(!ack){
278 if(!i2c_getbit()) /* receiver pulld SDA low */ 278 if(!i2c_getbit()) /* receiver pulled SDA low */
279 ack = 1; 279 ack = 1;
280 i2c_delay(CLOCK_HIGH_TIME/2); 280 i2c_delay(CLOCK_HIGH_TIME/2);
281 } 281 }
diff --git a/arch/cris/arch-v32/drivers/nandflash.c b/arch/cris/arch-v32/drivers/nandflash.c
index 93ddea4d9564..5ce015c6bb0d 100644
--- a/arch/cris/arch-v32/drivers/nandflash.c
+++ b/arch/cris/arch-v32/drivers/nandflash.c
@@ -138,7 +138,7 @@ struct mtd_info* __init crisv32_nand_flash_probe (void)
138 /* Enable the following for a flash based bad block table */ 138 /* Enable the following for a flash based bad block table */
139 this->options = NAND_USE_FLASH_BBT; 139 this->options = NAND_USE_FLASH_BBT;
140 140
141 /* Scan to find existance of the device */ 141 /* Scan to find existence of the device */
142 if (nand_scan (crisv32_mtd, 1)) { 142 if (nand_scan (crisv32_mtd, 1)) {
143 err = -ENXIO; 143 err = -ENXIO;
144 goto out_ior; 144 goto out_ior;
diff --git a/arch/cris/arch-v32/kernel/fasttimer.c b/arch/cris/arch-v32/kernel/fasttimer.c
index 79e1e4c2ca1d..b40551f9f40d 100644
--- a/arch/cris/arch-v32/kernel/fasttimer.c
+++ b/arch/cris/arch-v32/kernel/fasttimer.c
@@ -97,7 +97,7 @@
97 * with time based on jiffies and *R_TIMER0_DATA, uses a table 97 * with time based on jiffies and *R_TIMER0_DATA, uses a table
98 * for fast conversion of timer value to microseconds. 98 * for fast conversion of timer value to microseconds.
99 * (Much faster the standard do_gettimeofday() and we don't really 99 * (Much faster the standard do_gettimeofday() and we don't really
100 * wan't to use the true time - we wan't the "uptime" so timers don't screw up 100 * want to use the true time - we want the "uptime" so timers don't screw up
101 * when we change the time. 101 * when we change the time.
102 * TODO: Add efficient support for continuous timers as well. 102 * TODO: Add efficient support for continuous timers as well.
103 * 103 *
diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c
index cc361bf578ae..a9acaa270243 100644
--- a/arch/cris/arch-v32/kernel/irq.c
+++ b/arch/cris/arch-v32/kernel/irq.c
@@ -140,7 +140,7 @@ block_irq(int irq, int cpu)
140 spin_lock_irqsave(&irq_lock, flags); 140 spin_lock_irqsave(&irq_lock, flags);
141 intr_mask = REG_RD_INT(intr_vect, irq_regs[cpu], rw_mask); 141 intr_mask = REG_RD_INT(intr_vect, irq_regs[cpu], rw_mask);
142 142
143 /* Remember; 1 let thru, 0 block. */ 143 /* Remember; 1 let through, 0 block. */
144 intr_mask &= ~(1 << (irq - FIRST_IRQ)); 144 intr_mask &= ~(1 << (irq - FIRST_IRQ));
145 145
146 REG_WR_INT(intr_vect, irq_regs[cpu], rw_mask, intr_mask); 146 REG_WR_INT(intr_vect, irq_regs[cpu], rw_mask, intr_mask);
@@ -156,7 +156,7 @@ unblock_irq(int irq, int cpu)
156 spin_lock_irqsave(&irq_lock, flags); 156 spin_lock_irqsave(&irq_lock, flags);
157 intr_mask = REG_RD_INT(intr_vect, irq_regs[cpu], rw_mask); 157 intr_mask = REG_RD_INT(intr_vect, irq_regs[cpu], rw_mask);
158 158
159 /* Remember; 1 let thru, 0 block. */ 159 /* Remember; 1 let through, 0 block. */
160 intr_mask |= (1 << (irq - FIRST_IRQ)); 160 intr_mask |= (1 << (irq - FIRST_IRQ));
161 161
162 REG_WR_INT(intr_vect, irq_regs[cpu], rw_mask, intr_mask); 162 REG_WR_INT(intr_vect, irq_regs[cpu], rw_mask, intr_mask);
@@ -308,7 +308,7 @@ crisv32_do_multiple(struct pt_regs* regs)
308 */ 308 */
309 irq_enter(); 309 irq_enter();
310 310
311 /* Get which IRQs that happend. */ 311 /* Get which IRQs that happened. */
312 masked = REG_RD_INT(intr_vect, irq_regs[cpu], r_masked_vect); 312 masked = REG_RD_INT(intr_vect, irq_regs[cpu], r_masked_vect);
313 313
314 /* Calculate new IRQ mask with these IRQs disabled. */ 314 /* Calculate new IRQ mask with these IRQs disabled. */
@@ -366,7 +366,7 @@ init_IRQ(void)
366 for (i = 0; i < 256; i++) 366 for (i = 0; i < 256; i++)
367 etrax_irv->v[i] = weird_irq; 367 etrax_irv->v[i] = weird_irq;
368 368
369 /* Point all IRQ's to bad handlers. */ 369 /* Point all IRQs to bad handlers. */
370 for (i = FIRST_IRQ, j = 0; j < NR_IRQS; i++, j++) { 370 for (i = FIRST_IRQ, j = 0; j < NR_IRQS; i++, j++) {
371 irq_desc[j].chip = &crisv32_irq_type; 371 irq_desc[j].chip = &crisv32_irq_type;
372 set_exception_vector(i, interrupt[j]); 372 set_exception_vector(i, interrupt[j]);
diff --git a/arch/cris/arch-v32/kernel/process.c b/arch/cris/arch-v32/kernel/process.c
index 6326351af252..b72a15580dc7 100644
--- a/arch/cris/arch-v32/kernel/process.c
+++ b/arch/cris/arch-v32/kernel/process.c
@@ -162,7 +162,7 @@ copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
162 /* Put the switch stack right below the pt_regs. */ 162 /* Put the switch stack right below the pt_regs. */
163 swstack = ((struct switch_stack *) childregs) - 1; 163 swstack = ((struct switch_stack *) childregs) - 1;
164 164
165 /* Paramater to ret_from_sys_call. 0 is don't restart the syscall. */ 165 /* Parameter to ret_from_sys_call. 0 is don't restart the syscall. */
166 swstack->r9 = 0; 166 swstack->r9 = 0;
167 167
168 /* 168 /*
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c
index 7cd6ac803409..024cc6901974 100644
--- a/arch/cris/arch-v32/kernel/signal.c
+++ b/arch/cris/arch-v32/kernel/signal.c
@@ -347,7 +347,7 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs * regs, size_t frame_size)
347/* Grab and setup a signal frame. 347/* Grab and setup a signal frame.
348 * 348 *
349 * Basically a lot of state-info is stacked, and arranged for the 349 * Basically a lot of state-info is stacked, and arranged for the
350 * user-mode program to return to the kernel using either a trampiline 350 * user-mode program to return to the kernel using either a trampoline
351 * which performs the syscall sigreturn(), or a provided user-mode 351 * which performs the syscall sigreturn(), or a provided user-mode
352 * trampoline. 352 * trampoline.
353 */ 353 */
@@ -641,7 +641,7 @@ ugdb_trap_user(struct thread_info *ti, int sig)
641 user_regs(ti)->spc = 0; 641 user_regs(ti)->spc = 0;
642 } 642 }
643 /* FIXME: Filter out false h/w breakpoint hits (i.e. EDA 643 /* FIXME: Filter out false h/w breakpoint hits (i.e. EDA
644 not withing any configured h/w breakpoint range). Synchronize with 644 not within any configured h/w breakpoint range). Synchronize with
645 what already exists for kernel debugging. */ 645 what already exists for kernel debugging. */
646 if (((user_regs(ti)->exs & 0xff00) >> 8) == BREAK_8_INTR_VECT) { 646 if (((user_regs(ti)->exs & 0xff00) >> 8) == BREAK_8_INTR_VECT) {
647 /* Break 8: subtract 2 from ERP unless in a delay slot. */ 647 /* Break 8: subtract 2 from ERP unless in a delay slot. */
diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c
index 697494bc2de1..171c96e0a5d3 100644
--- a/arch/cris/arch-v32/kernel/smp.c
+++ b/arch/cris/arch-v32/kernel/smp.c
@@ -142,7 +142,7 @@ smp_boot_one_cpu(int cpuid)
142 return -1; 142 return -1;
143} 143}
144 144
145/* Secondary CPUs starts uing C here. Here we need to setup CPU 145/* Secondary CPUs starts using C here. Here we need to setup CPU
146 * specific stuff such as the local timer and the MMU. */ 146 * specific stuff such as the local timer and the MMU. */
147void __init smp_callin(void) 147void __init smp_callin(void)
148{ 148{
diff --git a/arch/cris/arch-v32/kernel/time.c b/arch/cris/arch-v32/kernel/time.c
index be0a01657d4f..2f7e8e200f2c 100644
--- a/arch/cris/arch-v32/kernel/time.c
+++ b/arch/cris/arch-v32/kernel/time.c
@@ -99,7 +99,7 @@ unsigned long do_slow_gettimeoffset(void)
99/* From timer MDS describing the hardware watchdog: 99/* From timer MDS describing the hardware watchdog:
100 * 4.3.1 Watchdog Operation 100 * 4.3.1 Watchdog Operation
101 * The watchdog timer is an 8-bit timer with a configurable start value. 101 * The watchdog timer is an 8-bit timer with a configurable start value.
102 * Once started the whatchdog counts downwards with a frequency of 763 Hz 102 * Once started the watchdog counts downwards with a frequency of 763 Hz
103 * (100/131072 MHz). When the watchdog counts down to 1, it generates an 103 * (100/131072 MHz). When the watchdog counts down to 1, it generates an
104 * NMI (Non Maskable Interrupt), and when it counts down to 0, it resets the 104 * NMI (Non Maskable Interrupt), and when it counts down to 0, it resets the
105 * chip. 105 * chip.
diff --git a/arch/cris/arch-v32/kernel/traps.c b/arch/cris/arch-v32/kernel/traps.c
index 2462b1ef1fbb..17fd3dbd1c80 100644
--- a/arch/cris/arch-v32/kernel/traps.c
+++ b/arch/cris/arch-v32/kernel/traps.c
@@ -105,7 +105,7 @@ bad_value:
105 105
106/* 106/*
107 * This gets called from entry.S when the watchdog has bitten. Show something 107 * This gets called from entry.S when the watchdog has bitten. Show something
108 * similiar to an Oops dump, and if the kernel if configured to be a nice doggy; 108 * similar to an Oops dump, and if the kernel is configured to be a nice doggy;
109 * halt instead of reboot. 109 * halt instead of reboot.
110 */ 110 */
111void 111void
diff --git a/arch/cris/arch-v32/lib/string.c b/arch/cris/arch-v32/lib/string.c
index 98e282ac824a..6740b2cebae5 100644
--- a/arch/cris/arch-v32/lib/string.c
+++ b/arch/cris/arch-v32/lib/string.c
@@ -41,7 +41,7 @@ void *memcpy(void *pdst,
41 Make sure the compiler is able to make something useful of this. 41 Make sure the compiler is able to make something useful of this.
42 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop). 42 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop).
43 43
44 If gcc was allright, it really would need no temporaries, and no 44 If gcc was alright, it really would need no temporaries, and no
45 stack space to save stuff on. */ 45 stack space to save stuff on. */
46 46
47 register void *return_dst __asm__ ("r10") = pdst; 47 register void *return_dst __asm__ ("r10") = pdst;
diff --git a/arch/cris/arch-v32/lib/usercopy.c b/arch/cris/arch-v32/lib/usercopy.c
index f0b08460c1be..04d0cf35a276 100644
--- a/arch/cris/arch-v32/lib/usercopy.c
+++ b/arch/cris/arch-v32/lib/usercopy.c
@@ -34,7 +34,7 @@ __copy_user (void __user *pdst, const void *psrc, unsigned long pn)
34 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop). 34 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop).
35 35
36 FIXME: Comment for old gcc version. Check. 36 FIXME: Comment for old gcc version. Check.
37 If gcc was allright, it really would need no temporaries, and no 37 If gcc was alright, it really would need no temporaries, and no
38 stack space to save stuff on. */ 38 stack space to save stuff on. */
39 39
40 register char *dst __asm__ ("r13") = pdst; 40 register char *dst __asm__ ("r13") = pdst;
@@ -168,7 +168,7 @@ __copy_user_zeroing (void __user *pdst, const void *psrc, unsigned long pn)
168 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop). 168 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop).
169 169
170 FIXME: Comment for old gcc version. Check. 170 FIXME: Comment for old gcc version. Check.
171 If gcc was allright, it really would need no temporaries, and no 171 If gcc was alright, it really would need no temporaries, and no
172 stack space to save stuff on. */ 172 stack space to save stuff on. */
173 173
174 register char *dst __asm__ ("r13") = pdst; 174 register char *dst __asm__ ("r13") = pdst;
@@ -332,7 +332,7 @@ __do_clear_user (void __user *pto, unsigned long pn)
332 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop). 332 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop).
333 333
334 FIXME: Comment for old gcc version. Check. 334 FIXME: Comment for old gcc version. Check.
335 If gcc was allright, it really would need no temporaries, and no 335 If gcc was alright, it really would need no temporaries, and no
336 stack space to save stuff on. */ 336 stack space to save stuff on. */
337 337
338 register char *dst __asm__ ("r13") = pto; 338 register char *dst __asm__ ("r13") = pto;
diff --git a/arch/cris/arch-v32/mm/tlb.c b/arch/cris/arch-v32/mm/tlb.c
index c2d12e9c40d7..a076ef6e9389 100644
--- a/arch/cris/arch-v32/mm/tlb.c
+++ b/arch/cris/arch-v32/mm/tlb.c
@@ -30,8 +30,8 @@ do { \
30 * The TLB can host up to 256 different mm contexts at the same time. The running 30 * The TLB can host up to 256 different mm contexts at the same time. The running
31 * context is found in the PID register. Each TLB entry contains a page_id that 31 * context is found in the PID register. Each TLB entry contains a page_id that
32 * has to match the PID register to give a hit. page_id_map keeps track of which 32 * has to match the PID register to give a hit. page_id_map keeps track of which
33 * mm's is assigned to which page_id's, making sure it's known when to 33 * mm is assigned to which page_id, making sure it's known when to invalidate TLB
34 * invalidate TLB entries. 34 * entries.
35 * 35 *
36 * The last page_id is never running, it is used as an invalid page_id so that 36 * The last page_id is never running, it is used as an invalid page_id so that
37 * it's possible to make TLB entries that will nerver match. 37 * it's possible to make TLB entries that will nerver match.
@@ -188,7 +188,7 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next,
188 spin_unlock(&mmu_context_lock); 188 spin_unlock(&mmu_context_lock);
189 189
190 /* 190 /*
191 * Remember the pgd for the fault handlers. Keep a seperate copy of it 191 * Remember the pgd for the fault handlers. Keep a separate copy of it
192 * because current and active_mm might be invalid at points where 192 * because current and active_mm might be invalid at points where
193 * there's still a need to derefer the pgd. 193 * there's still a need to derefer the pgd.
194 */ 194 */
diff --git a/arch/cris/kernel/irq.c b/arch/cris/kernel/irq.c
index 903ea62c6e21..5c27ff86121b 100644
--- a/arch/cris/kernel/irq.c
+++ b/arch/cris/kernel/irq.c
@@ -7,7 +7,7 @@
7 * Authors: Bjorn Wesen (bjornw@axis.com) 7 * Authors: Bjorn Wesen (bjornw@axis.com)
8 * 8 *
9 * This file contains the code used by various IRQ handling routines: 9 * This file contains the code used by various IRQ handling routines:
10 * asking for different IRQ's should be done through these routines 10 * asking for different IRQs should be done through these routines
11 * instead of just grabbing them. Thus setups with different IRQ numbers 11 * instead of just grabbing them. Thus setups with different IRQ numbers
12 * shouldn't result in any weird surprises, and installing new handlers 12 * shouldn't result in any weird surprises, and installing new handlers
13 * should be easier. 13 * should be easier.
@@ -15,7 +15,7 @@
15 */ 15 */
16 16
17/* 17/*
18 * IRQ's are in fact implemented a bit like signal handlers for the kernel. 18 * IRQs are in fact implemented a bit like signal handlers for the kernel.
19 * Naturally it's not a 1:1 relation, but there are similarities. 19 * Naturally it's not a 1:1 relation, but there are similarities.
20 */ 20 */
21 21
@@ -83,9 +83,9 @@ skip:
83 83
84 84
85/* called by the assembler IRQ entry functions defined in irq.h 85/* called by the assembler IRQ entry functions defined in irq.h
86 * to dispatch the interrupts to registred handlers 86 * to dispatch the interrupts to registered handlers
87 * interrupts are disabled upon entry - depending on if the 87 * interrupts are disabled upon entry - depending on if the
88 * interrupt was registred with IRQF_DISABLED or not, interrupts 88 * interrupt was registered with IRQF_DISABLED or not, interrupts
89 * are re-enabled or not. 89 * are re-enabled or not.
90 */ 90 */
91 91
diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c
index 8aab81430695..3034f3ff950c 100644
--- a/arch/cris/mm/fault.c
+++ b/arch/cris/mm/fault.c
@@ -13,7 +13,7 @@
13 * Fixed warning. 13 * Fixed warning.
14 * 14 *
15 * Revision 1.18 2005/01/12 08:10:14 starvik 15 * Revision 1.18 2005/01/12 08:10:14 starvik
16 * Readded the change of frametype when handling kernel page fault fixup 16 * Re-added the change of frametype when handling kernel page fault fixup
17 * for v10. This is necessary to avoid that the CPU remakes the faulting 17 * for v10. This is necessary to avoid that the CPU remakes the faulting
18 * access. 18 * access.
19 * 19 *
@@ -49,7 +49,7 @@
49 * 49 *
50 * Revision 1.8 2003/07/04 13:02:48 tobiasa 50 * Revision 1.8 2003/07/04 13:02:48 tobiasa
51 * Moved code snippet from arch/cris/mm/fault.c that searches for fixup code 51 * Moved code snippet from arch/cris/mm/fault.c that searches for fixup code
52 * to seperate function in arch-specific files. 52 * to separate function in arch-specific files.
53 * 53 *
54 * Revision 1.7 2003/01/22 06:48:38 starvik 54 * Revision 1.7 2003/01/22 06:48:38 starvik
55 * Fixed warnings issued by GCC 3.2.1 55 * Fixed warnings issued by GCC 3.2.1
diff --git a/arch/cris/mm/init.c b/arch/cris/mm/init.c
index b7842ff213a6..0c833d176226 100644
--- a/arch/cris/mm/init.c
+++ b/arch/cris/mm/init.c
@@ -8,7 +8,7 @@
8 * 8 *
9 * $Log: init.c,v $ 9 * $Log: init.c,v $
10 * Revision 1.11 2004/05/28 09:28:56 starvik 10 * Revision 1.11 2004/05/28 09:28:56 starvik
11 * Calculation of loops_per_usec moved because initalization order has changed 11 * Calculation of loops_per_usec moved because initialization order has changed
12 * in Linux 2.6. 12 * in Linux 2.6.
13 * 13 *
14 * Revision 1.10 2004/05/14 07:58:05 starvik 14 * Revision 1.10 2004/05/14 07:58:05 starvik
diff --git a/arch/cris/mm/tlb.c b/arch/cris/mm/tlb.c
index c4a98e2e529e..b7f8de576777 100644
--- a/arch/cris/mm/tlb.c
+++ b/arch/cris/mm/tlb.c
@@ -16,7 +16,7 @@
16/* The TLB can host up to 64 different mm contexts at the same time. 16/* The TLB can host up to 64 different mm contexts at the same time.
17 * The running context is R_MMU_CONTEXT, and each TLB entry contains a 17 * The running context is R_MMU_CONTEXT, and each TLB entry contains a
18 * page_id that has to match to give a hit. In page_id_map, we keep track 18 * page_id that has to match to give a hit. In page_id_map, we keep track
19 * of which mm's we have assigned which page_id's, so that we know when 19 * of which mm we have assigned to which page_id, so that we know when
20 * to invalidate TLB entries. 20 * to invalidate TLB entries.
21 * 21 *
22 * The last page_id is never running - it is used as an invalid page_id 22 * The last page_id is never running - it is used as an invalid page_id