patch-2.1.96 linux/arch/arm/lib/memcpy.S

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

diff -u --recursive --new-file v2.1.95/linux/arch/arm/lib/memcpy.S linux/arch/arm/lib/memcpy.S
@@ -8,6 +8,12 @@
 #include <asm/assembler.h>
 #include <linux/linkage.h>
 
+#ifndef ENTRY
+#define ENTRY(x...)				\
+		.globl	_##x;			\
+_##x:
+#endif
+
 		.text
 #define ENTER	\
 		mov	ip,sp	;\
@@ -84,6 +90,7 @@
 		blt	6b
 		ands	ip, r1, #3
 		beq	1b
+
 8:		bic	r1, r1, #3
 		ldr	r7, [r1], #4
 		cmp	ip, #2
@@ -105,14 +112,14 @@
 		subs	r2, r2, #16
 		bge	9b
 		adds	r2, r2, #12
-		blt	1b
+		blt	100f
 10:		mov	r3, r7, lsr #8
 		ldr	r7, [r1], #4
 		orr	r3, r3, r7, lsl #24
 		str	r3, [r0], #4
 		subs	r2, r2, #4
 		bge	10b
-		sub	r1, r1, #3
+100:		sub	r1, r1, #3
 		b	6b
 
 11:		cmp	r2, #12

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov