patch-2.1.36 linux/arch/sparc64/lib/checksum.S

Next file: linux/arch/sparc64/mm/init.c
Previous file: linux/arch/sparc64/kernel/systbls.S
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.35/linux/arch/sparc64/lib/checksum.S linux/arch/sparc64/lib/checksum.S
@@ -16,6 +16,7 @@
 #include <asm/errno.h>
 #include <asm/head.h>
 #include <asm/ptrace.h>
+#include <asm/asi.h>
 
 #define CSUM_BIGCHUNK(buf, offset, sum, t0, t1, t2, t3, t4, t5)	\
 	ldd	[buf + offset + 0x00], t0;			\
@@ -547,22 +548,18 @@
 	brz,pn	%i2, 2f
 	 mov	%i0, %o1
 	mov	%i1, %o0
-5:
-	call	__memcpy
+	call	__copy_from_user
 	 mov	%i2, %o2
 	brnz,a,pn %o0, 2f
 	 add	%i3, %i2, %i3
 	add	%i1, %i2, %i1
 2:
 	mov	%i1, %o0
-	call	__bzero
+        wr	%%g0, ASI_S, %%asi
+        call	__bzero_noasi
 	 mov	%i3, %o1
 1:
 	ldx	[%sp + STACK_BIAS + 264], %o2		! struct_ptr of parent
 	st	%i5, [%o2]
 	ret
 	 restore
-
-        .section __ex_table,#alloc
-        .align 4
-        .word 5b,2

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