diff options
author | Jesper Nilsson <jesper.nilsson@axis.com> | 2007-11-14 20:01:30 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-14 21:45:47 -0500 |
commit | 2b05d2b3b4d1e59e8710ec9274684d0d13eee34d (patch) | |
tree | ee38902baea38beb6e4a9497b1f02b25e579bda8 /arch/cris | |
parent | 3eed6393644c960e2343db7dabec08c775d3738f (diff) |
CRISv10 usercopy library add lineendings to asm
Removes warning when compiling arch/cris/arch-v10/lib/usercopy.c
No change except adding \n\ on the end of the lines has been done.
Removes warning about multi-line string literals.
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Mikael Starvik <mikael.starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/cris')
-rw-r--r-- | arch/cris/arch-v10/lib/usercopy.c | 314 |
1 files changed, 157 insertions, 157 deletions
diff --git a/arch/cris/arch-v10/lib/usercopy.c b/arch/cris/arch-v10/lib/usercopy.c index a12c708afc9a..b8e6c0430e5b 100644 --- a/arch/cris/arch-v10/lib/usercopy.c +++ b/arch/cris/arch-v10/lib/usercopy.c | |||
@@ -92,58 +92,58 @@ __copy_user (void __user *pdst, const void *psrc, unsigned long pn) | |||
92 | .ifnc %0%1%2%3,$r13$r11$r12$r10 \n\ | 92 | .ifnc %0%1%2%3,$r13$r11$r12$r10 \n\ |
93 | .err \n\ | 93 | .err \n\ |
94 | .endif \n\ | 94 | .endif \n\ |
95 | 95 | \n\ | |
96 | ;; Save the registers we'll use in the movem process | 96 | ;; Save the registers we'll use in the movem process \n\ |
97 | ;; on the stack. | 97 | ;; on the stack. \n\ |
98 | subq 11*4,$sp | 98 | subq 11*4,$sp \n\ |
99 | movem $r10,[$sp] | 99 | movem $r10,[$sp] \n\ |
100 | 100 | \n\ | |
101 | ;; Now we've got this: | 101 | ;; Now we've got this: \n\ |
102 | ;; r11 - src | 102 | ;; r11 - src \n\ |
103 | ;; r13 - dst | 103 | ;; r13 - dst \n\ |
104 | ;; r12 - n | 104 | ;; r12 - n \n\ |
105 | 105 | \n\ | |
106 | ;; Update n for the first loop | 106 | ;; Update n for the first loop \n\ |
107 | subq 44,$r12 | 107 | subq 44,$r12 \n\ |
108 | 108 | \n\ | |
109 | ; Since the noted PC of a faulting instruction in a delay-slot of a taken | 109 | ; Since the noted PC of a faulting instruction in a delay-slot of a taken \n\ |
110 | ; branch, is that of the branch target, we actually point at the from-movem | 110 | ; branch, is that of the branch target, we actually point at the from-movem \n\ |
111 | ; for this case. There is no ambiguity here; if there was a fault in that | 111 | ; for this case. There is no ambiguity here; if there was a fault in that \n\ |
112 | ; instruction (meaning a kernel oops), the faulted PC would be the address | 112 | ; instruction (meaning a kernel oops), the faulted PC would be the address \n\ |
113 | ; after *that* movem. | 113 | ; after *that* movem. \n\ |
114 | 114 | \n\ | |
115 | 0: | 115 | 0: \n\ |
116 | movem [$r11+],$r10 | 116 | movem [$r11+],$r10 \n\ |
117 | subq 44,$r12 | 117 | subq 44,$r12 \n\ |
118 | bge 0b | 118 | bge 0b \n\ |
119 | movem $r10,[$r13+] | 119 | movem $r10,[$r13+] \n\ |
120 | 1: | 120 | 1: \n\ |
121 | addq 44,$r12 ;; compensate for last loop underflowing n | 121 | addq 44,$r12 ;; compensate for last loop underflowing n \n\ |
122 | 122 | \n\ | |
123 | ;; Restore registers from stack | 123 | ;; Restore registers from stack \n\ |
124 | movem [$sp+],$r10 | 124 | movem [$sp+],$r10 \n\ |
125 | 2: | 125 | 2: \n\ |
126 | .section .fixup,\"ax\" | 126 | .section .fixup,\"ax\" \n\ |
127 | 127 | \n\ | |
128 | ; To provide a correct count in r10 of bytes that failed to be copied, | 128 | ; To provide a correct count in r10 of bytes that failed to be copied, \n\ |
129 | ; we jump back into the loop if the loop-branch was taken. There is no | 129 | ; we jump back into the loop if the loop-branch was taken. There is no \n\ |
130 | ; performance penalty for sany use; the program will segfault soon enough. | 130 | ; performance penalty for sany use; the program will segfault soon enough.\n\ |
131 | 131 | \n\ | |
132 | 3: | 132 | 3: \n\ |
133 | move.d [$sp],$r10 | 133 | move.d [$sp],$r10 \n\ |
134 | addq 44,$r10 | 134 | addq 44,$r10 \n\ |
135 | move.d $r10,[$sp] | 135 | move.d $r10,[$sp] \n\ |
136 | jump 0b | 136 | jump 0b \n\ |
137 | 4: | 137 | 4: \n\ |
138 | movem [$sp+],$r10 | 138 | movem [$sp+],$r10 \n\ |
139 | addq 44,$r10 | 139 | addq 44,$r10 \n\ |
140 | addq 44,$r12 | 140 | addq 44,$r12 \n\ |
141 | jump 2b | 141 | jump 2b \n\ |
142 | 142 | \n\ | |
143 | .previous | 143 | .previous \n\ |
144 | .section __ex_table,\"a\" | 144 | .section __ex_table,\"a\" \n\ |
145 | .dword 0b,3b | 145 | .dword 0b,3b \n\ |
146 | .dword 1b,4b | 146 | .dword 1b,4b \n\ |
147 | .previous" | 147 | .previous" |
148 | 148 | ||
149 | /* Outputs */ : "=r" (dst), "=r" (src), "=r" (n), "=r" (retn) | 149 | /* Outputs */ : "=r" (dst), "=r" (src), "=r" (n), "=r" (retn) |
@@ -253,59 +253,59 @@ __copy_user_zeroing (void __user *pdst, const void *psrc, unsigned long pn) | |||
253 | If you want to check that the allocation was right; then | 253 | If you want to check that the allocation was right; then |
254 | check the equalities in the first comment. It should say | 254 | check the equalities in the first comment. It should say |
255 | "r13=r13, r11=r11, r12=r12" */ | 255 | "r13=r13, r11=r11, r12=r12" */ |
256 | __asm__ volatile (" | 256 | __asm__ volatile ("\n\ |
257 | .ifnc %0%1%2%3,$r13$r11$r12$r10 \n\ | 257 | .ifnc %0%1%2%3,$r13$r11$r12$r10 \n\ |
258 | .err \n\ | 258 | .err \n\ |
259 | .endif \n\ | 259 | .endif \n\ |
260 | 260 | \n\ | |
261 | ;; Save the registers we'll use in the movem process | 261 | ;; Save the registers we'll use in the movem process \n\ |
262 | ;; on the stack. | 262 | ;; on the stack. \n\ |
263 | subq 11*4,$sp | 263 | subq 11*4,$sp \n\ |
264 | movem $r10,[$sp] | 264 | movem $r10,[$sp] \n\ |
265 | 265 | \n\ | |
266 | ;; Now we've got this: | 266 | ;; Now we've got this: \n\ |
267 | ;; r11 - src | 267 | ;; r11 - src \n\ |
268 | ;; r13 - dst | 268 | ;; r13 - dst \n\ |
269 | ;; r12 - n | 269 | ;; r12 - n \n\ |
270 | 270 | \n\ | |
271 | ;; Update n for the first loop | 271 | ;; Update n for the first loop \n\ |
272 | subq 44,$r12 | 272 | subq 44,$r12 \n\ |
273 | 0: | 273 | 0: \n\ |
274 | movem [$r11+],$r10 | 274 | movem [$r11+],$r10 \n\ |
275 | 1: | 275 | 1: \n\ |
276 | subq 44,$r12 | 276 | subq 44,$r12 \n\ |
277 | bge 0b | 277 | bge 0b \n\ |
278 | movem $r10,[$r13+] | 278 | movem $r10,[$r13+] \n\ |
279 | 279 | \n\ | |
280 | addq 44,$r12 ;; compensate for last loop underflowing n | 280 | addq 44,$r12 ;; compensate for last loop underflowing n \n\ |
281 | 281 | \n\ | |
282 | ;; Restore registers from stack | 282 | ;; Restore registers from stack \n\ |
283 | movem [$sp+],$r10 | 283 | movem [$sp+],$r10 \n\ |
284 | 4: | 284 | 4: \n\ |
285 | .section .fixup,\"ax\" | 285 | .section .fixup,\"ax\" \n\ |
286 | 286 | \n\ | |
287 | ;; Do not jump back into the loop if we fail. For some uses, we get a | 287 | ;; Do not jump back into the loop if we fail. For some uses, we get a \n\ |
288 | ;; page fault somewhere on the line. Without checking for page limits, | 288 | ;; page fault somewhere on the line. Without checking for page limits, \n\ |
289 | ;; we don't know where, but we need to copy accurately and keep an | 289 | ;; we don't know where, but we need to copy accurately and keep an \n\ |
290 | ;; accurate count; not just clear the whole line. To do that, we fall | 290 | ;; accurate count; not just clear the whole line. To do that, we fall \n\ |
291 | ;; down in the code below, proceeding with smaller amounts. It should | 291 | ;; down in the code below, proceeding with smaller amounts. It should \n\ |
292 | ;; be kept in mind that we have to cater to code like what at one time | 292 | ;; be kept in mind that we have to cater to code like what at one time \n\ |
293 | ;; was in fs/super.c: | 293 | ;; was in fs/super.c: \n\ |
294 | ;; i = size - copy_from_user((void *)page, data, size); | 294 | ;; i = size - copy_from_user((void *)page, data, size); \n\ |
295 | ;; which would cause repeated faults while clearing the remainder of | 295 | ;; which would cause repeated faults while clearing the remainder of \n\ |
296 | ;; the SIZE bytes at PAGE after the first fault. | 296 | ;; the SIZE bytes at PAGE after the first fault. \n\ |
297 | ;; A caveat here is that we must not fall through from a failing page | 297 | ;; A caveat here is that we must not fall through from a failing page \n\ |
298 | ;; to a valid page. | 298 | ;; to a valid page. \n\ |
299 | 299 | \n\ | |
300 | 3: | 300 | 3: \n\ |
301 | movem [$sp+],$r10 | 301 | movem [$sp+],$r10 \n\ |
302 | addq 44,$r12 ;; Get back count before faulting point. | 302 | addq 44,$r12 ;; Get back count before faulting point. \n\ |
303 | subq 44,$r11 ;; Get back pointer to faulting movem-line. | 303 | subq 44,$r11 ;; Get back pointer to faulting movem-line. \n\ |
304 | jump 4b ;; Fall through, pretending the fault didn't happen. | 304 | jump 4b ;; Fall through, pretending the fault didn't happen.\n\ |
305 | 305 | \n\ | |
306 | .previous | 306 | .previous \n\ |
307 | .section __ex_table,\"a\" | 307 | .section __ex_table,\"a\" \n\ |
308 | .dword 1b,3b | 308 | .dword 1b,3b \n\ |
309 | .previous" | 309 | .previous" |
310 | 310 | ||
311 | /* Outputs */ : "=r" (dst), "=r" (src), "=r" (n), "=r" (retn) | 311 | /* Outputs */ : "=r" (dst), "=r" (src), "=r" (n), "=r" (retn) |
@@ -425,64 +425,64 @@ __do_clear_user (void __user *pto, unsigned long pn) | |||
425 | If you want to check that the allocation was right; then | 425 | If you want to check that the allocation was right; then |
426 | check the equalities in the first comment. It should say | 426 | check the equalities in the first comment. It should say |
427 | something like "r13=r13, r11=r11, r12=r12". */ | 427 | something like "r13=r13, r11=r11, r12=r12". */ |
428 | __asm__ volatile (" | 428 | __asm__ volatile ("\n\ |
429 | .ifnc %0%1%2,$r13$r12$r10 \n\ | 429 | .ifnc %0%1%2,$r13$r12$r10 \n\ |
430 | .err \n\ | 430 | .err \n\ |
431 | .endif \n\ | 431 | .endif \n\ |
432 | 432 | \n\ | |
433 | ;; Save the registers we'll clobber in the movem process | 433 | ;; Save the registers we'll clobber in the movem process \n\ |
434 | ;; on the stack. Don't mention them to gcc, it will only be | 434 | ;; on the stack. Don't mention them to gcc, it will only be \n\ |
435 | ;; upset. | 435 | ;; upset. \n\ |
436 | subq 11*4,$sp | 436 | subq 11*4,$sp \n\ |
437 | movem $r10,[$sp] | 437 | movem $r10,[$sp] \n\ |
438 | 438 | \n\ | |
439 | clear.d $r0 | 439 | clear.d $r0 \n\ |
440 | clear.d $r1 | 440 | clear.d $r1 \n\ |
441 | clear.d $r2 | 441 | clear.d $r2 \n\ |
442 | clear.d $r3 | 442 | clear.d $r3 \n\ |
443 | clear.d $r4 | 443 | clear.d $r4 \n\ |
444 | clear.d $r5 | 444 | clear.d $r5 \n\ |
445 | clear.d $r6 | 445 | clear.d $r6 \n\ |
446 | clear.d $r7 | 446 | clear.d $r7 \n\ |
447 | clear.d $r8 | 447 | clear.d $r8 \n\ |
448 | clear.d $r9 | 448 | clear.d $r9 \n\ |
449 | clear.d $r10 | 449 | clear.d $r10 \n\ |
450 | clear.d $r11 | 450 | clear.d $r11 \n\ |
451 | 451 | \n\ | |
452 | ;; Now we've got this: | 452 | ;; Now we've got this: \n\ |
453 | ;; r13 - dst | 453 | ;; r13 - dst \n\ |
454 | ;; r12 - n | 454 | ;; r12 - n \n\ |
455 | 455 | \n\ | |
456 | ;; Update n for the first loop | 456 | ;; Update n for the first loop \n\ |
457 | subq 12*4,$r12 | 457 | subq 12*4,$r12 \n\ |
458 | 0: | 458 | 0: \n\ |
459 | subq 12*4,$r12 | 459 | subq 12*4,$r12 \n\ |
460 | bge 0b | 460 | bge 0b \n\ |
461 | movem $r11,[$r13+] | 461 | movem $r11,[$r13+] \n\ |
462 | 1: | 462 | 1: \n\ |
463 | addq 12*4,$r12 ;; compensate for last loop underflowing n | 463 | addq 12*4,$r12 ;; compensate for last loop underflowing n\n\ |
464 | 464 | \n\ | |
465 | ;; Restore registers from stack | 465 | ;; Restore registers from stack \n\ |
466 | movem [$sp+],$r10 | 466 | movem [$sp+],$r10 \n\ |
467 | 2: | 467 | 2: \n\ |
468 | .section .fixup,\"ax\" | 468 | .section .fixup,\"ax\" \n\ |
469 | 3: | 469 | 3: \n\ |
470 | move.d [$sp],$r10 | 470 | move.d [$sp],$r10 \n\ |
471 | addq 12*4,$r10 | 471 | addq 12*4,$r10 \n\ |
472 | move.d $r10,[$sp] | 472 | move.d $r10,[$sp] \n\ |
473 | clear.d $r10 | 473 | clear.d $r10 \n\ |
474 | jump 0b | 474 | jump 0b \n\ |
475 | 475 | \n\ | |
476 | 4: | 476 | 4: \n\ |
477 | movem [$sp+],$r10 | 477 | movem [$sp+],$r10 \n\ |
478 | addq 12*4,$r10 | 478 | addq 12*4,$r10 \n\ |
479 | addq 12*4,$r12 | 479 | addq 12*4,$r12 \n\ |
480 | jump 2b | 480 | jump 2b \n\ |
481 | 481 | \n\ | |
482 | .previous | 482 | .previous \n\ |
483 | .section __ex_table,\"a\" | 483 | .section __ex_table,\"a\" \n\ |
484 | .dword 0b,3b | 484 | .dword 0b,3b \n\ |
485 | .dword 1b,4b | 485 | .dword 1b,4b \n\ |
486 | .previous" | 486 | .previous" |
487 | 487 | ||
488 | /* Outputs */ : "=r" (dst), "=r" (n), "=r" (retn) | 488 | /* Outputs */ : "=r" (dst), "=r" (n), "=r" (retn) |