diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-06-25 06:23:45 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-06-25 06:23:45 -0400 |
commit | 1b93a71755f2b15450b3e3045dab58a633e37b18 (patch) | |
tree | 0d19367dbea9d083f9e374a21a8e82595392de98 /arch/arm/lib/uaccess.S | |
parent | 7999d8d7a611bee902446939952859caf1367c25 (diff) |
[ARM] Remove LOADREGS macro
As for RETINSTR, LOADREGS is a left-over from the 26-bit days.
Remove it.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/lib/uaccess.S')
-rw-r--r-- | arch/arm/lib/uaccess.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/lib/uaccess.S b/arch/arm/lib/uaccess.S index 0cc450f863b6..1f1545d737be 100644 --- a/arch/arm/lib/uaccess.S +++ b/arch/arm/lib/uaccess.S | |||
@@ -105,7 +105,7 @@ USER( strgtbt r3, [r0], #1) @ May fault | |||
105 | movs ip, r2 | 105 | movs ip, r2 |
106 | bne .Lc2u_nowords | 106 | bne .Lc2u_nowords |
107 | .Lc2u_finished: mov r0, #0 | 107 | .Lc2u_finished: mov r0, #0 |
108 | LOADREGS(fd,sp!,{r2, r4 - r7, pc}) | 108 | ldmfd sp!, {r2, r4 - r7, pc} |
109 | 109 | ||
110 | .Lc2u_src_not_aligned: | 110 | .Lc2u_src_not_aligned: |
111 | bic r1, r1, #3 | 111 | bic r1, r1, #3 |
@@ -280,7 +280,7 @@ USER( strgtbt r3, [r0], #1) @ May fault | |||
280 | 280 | ||
281 | .section .fixup,"ax" | 281 | .section .fixup,"ax" |
282 | .align 0 | 282 | .align 0 |
283 | 9001: LOADREGS(fd,sp!, {r0, r4 - r7, pc}) | 283 | 9001: ldmfd sp!, {r0, r4 - r7, pc} |
284 | .previous | 284 | .previous |
285 | 285 | ||
286 | /* Prototype: unsigned long __arch_copy_from_user(void *to,const void *from,unsigned long n); | 286 | /* Prototype: unsigned long __arch_copy_from_user(void *to,const void *from,unsigned long n); |
@@ -369,7 +369,7 @@ USER( ldrgtbt r3, [r1], #1) @ May fault | |||
369 | bne .Lcfu_nowords | 369 | bne .Lcfu_nowords |
370 | .Lcfu_finished: mov r0, #0 | 370 | .Lcfu_finished: mov r0, #0 |
371 | add sp, sp, #8 | 371 | add sp, sp, #8 |
372 | LOADREGS(fd,sp!,{r4 - r7, pc}) | 372 | ldmfd sp!, {r4 - r7, pc} |
373 | 373 | ||
374 | .Lcfu_src_not_aligned: | 374 | .Lcfu_src_not_aligned: |
375 | bic r1, r1, #3 | 375 | bic r1, r1, #3 |
@@ -556,6 +556,6 @@ USER( ldrgtbt r3, [r1], #1) @ May fault | |||
556 | movne r1, r4 | 556 | movne r1, r4 |
557 | blne __memzero | 557 | blne __memzero |
558 | mov r0, r4 | 558 | mov r0, r4 |
559 | LOADREGS(fd,sp!, {r4 - r7, pc}) | 559 | ldmfd sp!, {r4 - r7, pc} |
560 | .previous | 560 | .previous |
561 | 561 | ||