X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Farm%2Flib%2Fstrncpy_from_user.S;h=629cc87752769e607ae6edf35e72d4e5e79951c3;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=36e3741a37729a59f8eb30e5d66ba3ab5e67fcbc;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/arch/arm/lib/strncpy_from_user.S b/arch/arm/lib/strncpy_from_user.S
index 36e3741a3..629cc8775 100644
--- a/arch/arm/lib/strncpy_from_user.S
+++ b/arch/arm/lib/strncpy_from_user.S
@@ -20,7 +20,8 @@
  * returns the number of characters copied (strlen of copied string),
  *  -EFAULT on exception, or "len" if we fill the whole buffer
  */
-ENTRY(__strncpy_from_user)
+ENTRY(__arch_strncpy_from_user)
+	save_lr
 	mov	ip, r1
 1:	subs	r2, r2, #1
 USER(	ldrplbt	r3, [r1], #1)
@@ -30,13 +31,13 @@ USER(	ldrplbt	r3, [r1], #1)
 	bne	1b
 	sub	r1, r1, #1	@ take NUL character out of count
 2:	sub	r0, r1, ip
-	mov	pc, lr
+	restore_pc
 
 	.section .fixup,"ax"
 	.align	0
 9001:	mov	r3, #0
 	strb	r3, [r0, #0]	@ null terminate
 	mov	r0, #-EFAULT
-	mov	pc, lr
+	restore_pc
 	.previous