diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-10-11 18:46:15 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-10-11 18:46:15 -0400 |
commit | 21a151d8ca3aa74ee79f9791a9d4dc370d3e0636 (patch) | |
tree | 8556b3a32ded6a49225beb4a7aa4447cc87a0e00 /arch/mips/mm | |
parent | 49a89efbbbcc178a39555c43bd59a7593c429664 (diff) |
[MIPS] checkfiles: Fix "need space after that ','" errors.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mm')
-rw-r--r-- | arch/mips/mm/c-r4k.c | 8 | ||||
-rw-r--r-- | arch/mips/mm/cerr-sb1.c | 24 | ||||
-rw-r--r-- | arch/mips/mm/pg-sb1.c | 4 | ||||
-rw-r--r-- | arch/mips/mm/pgtable.c | 8 | ||||
-rw-r--r-- | arch/mips/mm/tlb-r8k.c | 2 | ||||
-rw-r--r-- | arch/mips/mm/tlbex.c | 94 |
6 files changed, 74 insertions, 66 deletions
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c index 8b7b7c57bac..971f6c047b8 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c | |||
@@ -164,12 +164,12 @@ static inline void tx49_blast_icache32(void) | |||
164 | /* I'm in even chunk. blast odd chunks */ | 164 | /* I'm in even chunk. blast odd chunks */ |
165 | for (ws = 0; ws < ws_end; ws += ws_inc) | 165 | for (ws = 0; ws < ws_end; ws += ws_inc) |
166 | for (addr = start + 0x400; addr < end; addr += 0x400 * 2) | 166 | for (addr = start + 0x400; addr < end; addr += 0x400 * 2) |
167 | cache32_unroll32(addr|ws,Index_Invalidate_I); | 167 | cache32_unroll32(addr|ws, Index_Invalidate_I); |
168 | CACHE32_UNROLL32_ALIGN; | 168 | CACHE32_UNROLL32_ALIGN; |
169 | /* I'm in odd chunk. blast even chunks */ | 169 | /* I'm in odd chunk. blast even chunks */ |
170 | for (ws = 0; ws < ws_end; ws += ws_inc) | 170 | for (ws = 0; ws < ws_end; ws += ws_inc) |
171 | for (addr = start; addr < end; addr += 0x400 * 2) | 171 | for (addr = start; addr < end; addr += 0x400 * 2) |
172 | cache32_unroll32(addr|ws,Index_Invalidate_I); | 172 | cache32_unroll32(addr|ws, Index_Invalidate_I); |
173 | } | 173 | } |
174 | 174 | ||
175 | static inline void blast_icache32_r4600_v1_page_indexed(unsigned long page) | 175 | static inline void blast_icache32_r4600_v1_page_indexed(unsigned long page) |
@@ -195,12 +195,12 @@ static inline void tx49_blast_icache32_page_indexed(unsigned long page) | |||
195 | /* I'm in even chunk. blast odd chunks */ | 195 | /* I'm in even chunk. blast odd chunks */ |
196 | for (ws = 0; ws < ws_end; ws += ws_inc) | 196 | for (ws = 0; ws < ws_end; ws += ws_inc) |
197 | for (addr = start + 0x400; addr < end; addr += 0x400 * 2) | 197 | for (addr = start + 0x400; addr < end; addr += 0x400 * 2) |
198 | cache32_unroll32(addr|ws,Index_Invalidate_I); | 198 | cache32_unroll32(addr|ws, Index_Invalidate_I); |
199 | CACHE32_UNROLL32_ALIGN; | 199 | CACHE32_UNROLL32_ALIGN; |
200 | /* I'm in odd chunk. blast even chunks */ | 200 | /* I'm in odd chunk. blast even chunks */ |
201 | for (ws = 0; ws < ws_end; ws += ws_inc) | 201 | for (ws = 0; ws < ws_end; ws += ws_inc) |
202 | for (addr = start; addr < end; addr += 0x400 * 2) | 202 | for (addr = start; addr < end; addr += 0x400 * 2) |
203 | cache32_unroll32(addr|ws,Index_Invalidate_I); | 203 | cache32_unroll32(addr|ws, Index_Invalidate_I); |
204 | } | 204 | } |
205 | 205 | ||
206 | static void (* r4k_blast_icache_page)(unsigned long addr); | 206 | static void (* r4k_blast_icache_page)(unsigned long addr); |
diff --git a/arch/mips/mm/cerr-sb1.c b/arch/mips/mm/cerr-sb1.c index 4c72e650f9b..e7f539e3284 100644 --- a/arch/mips/mm/cerr-sb1.c +++ b/arch/mips/mm/cerr-sb1.c | |||
@@ -271,14 +271,22 @@ asmlinkage void sb1_cache_error(void) | |||
271 | 271 | ||
272 | /* Parity lookup table. */ | 272 | /* Parity lookup table. */ |
273 | static const uint8_t parity[256] = { | 273 | static const uint8_t parity[256] = { |
274 | 0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1, | 274 | 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, |
275 | 1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0, | 275 | 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, |
276 | 1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0, | 276 | 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, |
277 | 0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1, | 277 | 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, |
278 | 1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0, | 278 | 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, |
279 | 0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1, | 279 | 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, |
280 | 0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1, | 280 | 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, |
281 | 1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0 | 281 | 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, |
282 | 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, | ||
283 | 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, | ||
284 | 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, | ||
285 | 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, | ||
286 | 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, | ||
287 | 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, | ||
288 | 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, | ||
289 | 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0 | ||
282 | }; | 290 | }; |
283 | 291 | ||
284 | /* Masks to select bits for Hamming parity, mask_72_64[i] for bit[i] */ | 292 | /* Masks to select bits for Hamming parity, mask_72_64[i] for bit[i] */ |
diff --git a/arch/mips/mm/pg-sb1.c b/arch/mips/mm/pg-sb1.c index 82f42ace73c..a3e98c243a8 100644 --- a/arch/mips/mm/pg-sb1.c +++ b/arch/mips/mm/pg-sb1.c | |||
@@ -188,9 +188,9 @@ static inline void copy_page_cpu(void *to, void *from) | |||
188 | : "+r" (src), "+r" (dst) | 188 | : "+r" (src), "+r" (dst) |
189 | : "r" (end) | 189 | : "r" (end) |
190 | #ifdef CONFIG_64BIT | 190 | #ifdef CONFIG_64BIT |
191 | : "$8","$9","$10","$11","memory"); | 191 | : "$8", "$9", "$10", "$11", "memory"); |
192 | #else | 192 | #else |
193 | : "$2","$3","$6","$7","$8","$9","$10","$11","memory"); | 193 | : "$2", "$3", "$6", "$7", "$8", "$9", "$10", "$11", "memory"); |
194 | #endif | 194 | #endif |
195 | } | 195 | } |
196 | 196 | ||
diff --git a/arch/mips/mm/pgtable.c b/arch/mips/mm/pgtable.c index c93aa6cbcac..57df1c38e30 100644 --- a/arch/mips/mm/pgtable.c +++ b/arch/mips/mm/pgtable.c | |||
@@ -29,9 +29,9 @@ void show_mem(void) | |||
29 | shared += page_count(page) - 1; | 29 | shared += page_count(page) - 1; |
30 | } | 30 | } |
31 | printk("%d pages of RAM\n", total); | 31 | printk("%d pages of RAM\n", total); |
32 | printk("%d pages of HIGHMEM\n",highmem); | 32 | printk("%d pages of HIGHMEM\n", highmem); |
33 | printk("%d reserved pages\n",reserved); | 33 | printk("%d reserved pages\n", reserved); |
34 | printk("%d pages shared\n",shared); | 34 | printk("%d pages shared\n", shared); |
35 | printk("%d pages swap cached\n",cached); | 35 | printk("%d pages swap cached\n", cached); |
36 | #endif | 36 | #endif |
37 | } | 37 | } |
diff --git a/arch/mips/mm/tlb-r8k.c b/arch/mips/mm/tlb-r8k.c index 266a47d65ee..bd8409d8ff6 100644 --- a/arch/mips/mm/tlb-r8k.c +++ b/arch/mips/mm/tlb-r8k.c | |||
@@ -56,7 +56,7 @@ void local_flush_tlb_mm(struct mm_struct *mm) | |||
56 | int cpu = smp_processor_id(); | 56 | int cpu = smp_processor_id(); |
57 | 57 | ||
58 | if (cpu_context(cpu, mm) != 0) | 58 | if (cpu_context(cpu, mm) != 0) |
59 | drop_mmu_context(mm,cpu); | 59 | drop_mmu_context(mm, cpu); |
60 | } | 60 | } |
61 | 61 | ||
62 | void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start, | 62 | void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start, |
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index c3da4fefbcb..a61246d3533 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c | |||
@@ -141,53 +141,53 @@ struct insn { | |||
141 | | (f) << FUNC_SH) | 141 | | (f) << FUNC_SH) |
142 | 142 | ||
143 | static __initdata struct insn insn_table[] = { | 143 | static __initdata struct insn insn_table[] = { |
144 | { insn_addiu, M(addiu_op,0,0,0,0,0), RS | RT | SIMM }, | 144 | { insn_addiu, M(addiu_op, 0, 0, 0, 0, 0), RS | RT | SIMM }, |
145 | { insn_addu, M(spec_op,0,0,0,0,addu_op), RS | RT | RD }, | 145 | { insn_addu, M(spec_op, 0, 0, 0, 0, addu_op), RS | RT | RD }, |
146 | { insn_and, M(spec_op,0,0,0,0,and_op), RS | RT | RD }, | 146 | { insn_and, M(spec_op, 0, 0, 0, 0, and_op), RS | RT | RD }, |
147 | { insn_andi, M(andi_op,0,0,0,0,0), RS | RT | UIMM }, | 147 | { insn_andi, M(andi_op, 0, 0, 0, 0, 0), RS | RT | UIMM }, |
148 | { insn_beq, M(beq_op,0,0,0,0,0), RS | RT | BIMM }, | 148 | { insn_beq, M(beq_op, 0, 0, 0, 0, 0), RS | RT | BIMM }, |
149 | { insn_beql, M(beql_op,0,0,0,0,0), RS | RT | BIMM }, | 149 | { insn_beql, M(beql_op, 0, 0, 0, 0, 0), RS | RT | BIMM }, |
150 | { insn_bgez, M(bcond_op,0,bgez_op,0,0,0), RS | BIMM }, | 150 | { insn_bgez, M(bcond_op, 0, bgez_op, 0, 0, 0), RS | BIMM }, |
151 | { insn_bgezl, M(bcond_op,0,bgezl_op,0,0,0), RS | BIMM }, | 151 | { insn_bgezl, M(bcond_op, 0, bgezl_op, 0, 0, 0), RS | BIMM }, |
152 | { insn_bltz, M(bcond_op,0,bltz_op,0,0,0), RS | BIMM }, | 152 | { insn_bltz, M(bcond_op, 0, bltz_op, 0, 0, 0), RS | BIMM }, |
153 | { insn_bltzl, M(bcond_op,0,bltzl_op,0,0,0), RS | BIMM }, | 153 | { insn_bltzl, M(bcond_op, 0, bltzl_op, 0, 0, 0), RS | BIMM }, |
154 | { insn_bne, M(bne_op,0,0,0,0,0), RS | RT | BIMM }, | 154 | { insn_bne, M(bne_op, 0, 0, 0, 0, 0), RS | RT | BIMM }, |
155 | { insn_daddiu, M(daddiu_op,0,0,0,0,0), RS | RT | SIMM }, | 155 | { insn_daddiu, M(daddiu_op, 0, 0, 0, 0, 0), RS | RT | SIMM }, |
156 | { insn_daddu, M(spec_op,0,0,0,0,daddu_op), RS | RT | RD }, | 156 | { insn_daddu, M(spec_op, 0, 0, 0, 0, daddu_op), RS | RT | RD }, |
157 | { insn_dmfc0, M(cop0_op,dmfc_op,0,0,0,0), RT | RD | SET}, | 157 | { insn_dmfc0, M(cop0_op, dmfc_op, 0, 0, 0, 0), RT | RD | SET}, |
158 | { insn_dmtc0, M(cop0_op,dmtc_op,0,0,0,0), RT | RD | SET}, | 158 | { insn_dmtc0, M(cop0_op, dmtc_op, 0, 0, 0, 0), RT | RD | SET}, |
159 | { insn_dsll, M(spec_op,0,0,0,0,dsll_op), RT | RD | RE }, | 159 | { insn_dsll, M(spec_op, 0, 0, 0, 0, dsll_op), RT | RD | RE }, |
160 | { insn_dsll32, M(spec_op,0,0,0,0,dsll32_op), RT | RD | RE }, | 160 | { insn_dsll32, M(spec_op, 0, 0, 0, 0, dsll32_op), RT | RD | RE }, |
161 | { insn_dsra, M(spec_op,0,0,0,0,dsra_op), RT | RD | RE }, | 161 | { insn_dsra, M(spec_op, 0, 0, 0, 0, dsra_op), RT | RD | RE }, |
162 | { insn_dsrl, M(spec_op,0,0,0,0,dsrl_op), RT | RD | RE }, | 162 | { insn_dsrl, M(spec_op, 0, 0, 0, 0, dsrl_op), RT | RD | RE }, |
163 | { insn_dsrl32, M(spec_op,0,0,0,0,dsrl32_op), RT | RD | RE }, | 163 | { insn_dsrl32, M(spec_op, 0, 0, 0, 0, dsrl32_op), RT | RD | RE }, |
164 | { insn_dsubu, M(spec_op,0,0,0,0,dsubu_op), RS | RT | RD }, | 164 | { insn_dsubu, M(spec_op, 0, 0, 0, 0, dsubu_op), RS | RT | RD }, |
165 | { insn_eret, M(cop0_op,cop_op,0,0,0,eret_op), 0 }, | 165 | { insn_eret, M(cop0_op, cop_op, 0, 0, 0, eret_op), 0 }, |
166 | { insn_j, M(j_op,0,0,0,0,0), JIMM }, | 166 | { insn_j, M(j_op, 0, 0, 0, 0, 0), JIMM }, |
167 | { insn_jal, M(jal_op,0,0,0,0,0), JIMM }, | 167 | { insn_jal, M(jal_op, 0, 0, 0, 0, 0), JIMM }, |
168 | { insn_jr, M(spec_op,0,0,0,0,jr_op), RS }, | 168 | { insn_jr, M(spec_op, 0, 0, 0, 0, jr_op), RS }, |
169 | { insn_ld, M(ld_op,0,0,0,0,0), RS | RT | SIMM }, | 169 | { insn_ld, M(ld_op, 0, 0, 0, 0, 0), RS | RT | SIMM }, |
170 | { insn_ll, M(ll_op,0,0,0,0,0), RS | RT | SIMM }, | 170 | { insn_ll, M(ll_op, 0, 0, 0, 0, 0), RS | RT | SIMM }, |
171 | { insn_lld, M(lld_op,0,0,0,0,0), RS | RT | SIMM }, | 171 | { insn_lld, M(lld_op, 0, 0, 0, 0, 0), RS | RT | SIMM }, |
172 | { insn_lui, M(lui_op,0,0,0,0,0), RT | SIMM }, | 172 | { insn_lui, M(lui_op, 0, 0, 0, 0, 0), RT | SIMM }, |
173 | { insn_lw, M(lw_op,0,0,0,0,0), RS | RT | SIMM }, | 173 | { insn_lw, M(lw_op, 0, 0, 0, 0, 0), RS | RT | SIMM }, |
174 | { insn_mfc0, M(cop0_op,mfc_op,0,0,0,0), RT | RD | SET}, | 174 | { insn_mfc0, M(cop0_op, mfc_op, 0, 0, 0, 0), RT | RD | SET}, |
175 | { insn_mtc0, M(cop0_op,mtc_op,0,0,0,0), RT | RD | SET}, | 175 | { insn_mtc0, M(cop0_op, mtc_op, 0, 0, 0, 0), RT | RD | SET}, |
176 | { insn_ori, M(ori_op,0,0,0,0,0), RS | RT | UIMM }, | 176 | { insn_ori, M(ori_op, 0, 0, 0, 0, 0), RS | RT | UIMM }, |
177 | { insn_rfe, M(cop0_op,cop_op,0,0,0,rfe_op), 0 }, | 177 | { insn_rfe, M(cop0_op, cop_op, 0, 0, 0, rfe_op), 0 }, |
178 | { insn_sc, M(sc_op,0,0,0,0,0), RS | RT | SIMM }, | 178 | { insn_sc, M(sc_op, 0, 0, 0, 0, 0), RS | RT | SIMM }, |
179 | { insn_scd, M(scd_op,0,0,0,0,0), RS | RT | SIMM }, | 179 | { insn_scd, M(scd_op, 0, 0, 0, 0, 0), RS | RT | SIMM }, |
180 | { insn_sd, M(sd_op,0,0,0,0,0), RS | RT | SIMM }, | 180 | { insn_sd, M(sd_op, 0, 0, 0, 0, 0), RS | RT | SIMM }, |
181 | { insn_sll, M(spec_op,0,0,0,0,sll_op), RT | RD | RE }, | 181 | { insn_sll, M(spec_op, 0, 0, 0, 0, sll_op), RT | RD | RE }, |
182 | { insn_sra, M(spec_op,0,0,0,0,sra_op), RT | RD | RE }, | 182 | { insn_sra, M(spec_op, 0, 0, 0, 0, sra_op), RT | RD | RE }, |
183 | { insn_srl, M(spec_op,0,0,0,0,srl_op), RT | RD | RE }, | 183 | { insn_srl, M(spec_op, 0, 0, 0, 0, srl_op), RT | RD | RE }, |
184 | { insn_subu, M(spec_op,0,0,0,0,subu_op), RS | RT | RD }, | 184 | { insn_subu, M(spec_op, 0, 0, 0, 0, subu_op), RS | RT | RD }, |
185 | { insn_sw, M(sw_op,0,0,0,0,0), RS | RT | SIMM }, | 185 | { insn_sw, M(sw_op, 0, 0, 0, 0, 0), RS | RT | SIMM }, |
186 | { insn_tlbp, M(cop0_op,cop_op,0,0,0,tlbp_op), 0 }, | 186 | { insn_tlbp, M(cop0_op, cop_op, 0, 0, 0, tlbp_op), 0 }, |
187 | { insn_tlbwi, M(cop0_op,cop_op,0,0,0,tlbwi_op), 0 }, | 187 | { insn_tlbwi, M(cop0_op, cop_op, 0, 0, 0, tlbwi_op), 0 }, |
188 | { insn_tlbwr, M(cop0_op,cop_op,0,0,0,tlbwr_op), 0 }, | 188 | { insn_tlbwr, M(cop0_op, cop_op, 0, 0, 0, tlbwr_op), 0 }, |
189 | { insn_xor, M(spec_op,0,0,0,0,xor_op), RS | RT | RD }, | 189 | { insn_xor, M(spec_op, 0, 0, 0, 0, xor_op), RS | RT | RD }, |
190 | { insn_xori, M(xori_op,0,0,0,0,0), RS | RT | UIMM }, | 190 | { insn_xori, M(xori_op, 0, 0, 0, 0, 0), RS | RT | UIMM }, |
191 | { insn_invalid, 0, 0 } | 191 | { insn_invalid, 0, 0 } |
192 | }; | 192 | }; |
193 | 193 | ||