patch-2.4.0-test8 linux/arch/arm/lib/strchr.S

Next file: linux/arch/arm/lib/strncpy_from_user.S
Previous file: linux/arch/arm/lib/memzero.S
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test7/linux/arch/arm/lib/strchr.S linux/arch/arm/lib/strchr.S
@@ -1,19 +1,16 @@
 /*
  * linux/arch/arm/lib/strchr.S
  *
- * Copyright (C) 1995-1999 Russell King
+ * Copyright (C) 1995-2000 Russell King
  *
  * ASM optimised string functions
- *
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include "constants.h"
 
 		.text
+		.align	5
 ENTRY(strchr)
-		str	lr, [sp, #-4]!
-		mov	r3, #0
 1:		ldrb	r2, [r0], #1
 		teq	r2, r1
 		teqne	r2, #0
@@ -21,6 +18,4 @@
 		teq	r2, #0
 		moveq	r0, #0
 		subne	r0, r0, #1
-		LOADREGS(fd, sp!, {pc})
-
-
+		RETINSTR(mov,pc,lr)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)