aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/lib/strnlen_user.S
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-06-25 11:37:09 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-06-25 11:37:09 +0100
commit405040a78b33e39edf4180fc993b9608f07d3c41 (patch)
tree6ef511fb4370c4eecc2743234bdd9aade281be86 /arch/arm/lib/strnlen_user.S
parent800d8b5c4b322798414100c253524aaf1bb9cb86 (diff)
downloadkernel_samsung_smdk4412-405040a78b33e39edf4180fc993b9608f07d3c41.tar.gz
kernel_samsung_smdk4412-405040a78b33e39edf4180fc993b9608f07d3c41.tar.bz2
kernel_samsung_smdk4412-405040a78b33e39edf4180fc993b9608f07d3c41.zip
[ARM] Remove save_lr/restore_pc macros
As for RETINSTR/LOADREGS macros, these were for compatibility with 26-bit ARMs. No longer required, so remove them. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/lib/strnlen_user.S')
-rw-r--r--arch/arm/lib/strnlen_user.S5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/lib/strnlen_user.S b/arch/arm/lib/strnlen_user.S
index 67bcd826812..3668a15991e 100644
--- a/arch/arm/lib/strnlen_user.S
+++ b/arch/arm/lib/strnlen_user.S
@@ -21,7 +21,6 @@
* or zero on exception, or n + 1 if too long
*/
ENTRY(__arch_strnlen_user)
- save_lr
mov r2, r0
1:
USER( ldrbt r3, [r0], #1)
@@ -31,10 +30,10 @@ USER( ldrbt r3, [r0], #1)
bne 1b
add r0, r0, #1
2: sub r0, r0, r2
- restore_pc
+ mov pc, lr
.section .fixup,"ax"
.align 0
9001: mov r0, #0
- restore_pc
+ mov pc, lr
.previous