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

Next file: linux/arch/sparc64/lib/strlen.S
Previous file: linux/arch/sparc64/kernel/winfixup.S
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.123/linux/arch/sparc64/lib/checksum.S linux/arch/sparc64/lib/checksum.S
@@ -180,7 +180,7 @@
 	bcs,a,pn	%xcc, 1f		! CTI
 	 add		%o0, 1, %o0		! IEU1	4 clocks (mispredict)
 1:	retl					! CTI	Group brk forced
-	 sllx		%g4, 32,%g4		! IEU0	Group
+	 sllx		%g4, 32, %g4		! IEU0	Group
 
 ccslow:	mov	0, %g5
 	brlez,pn %len, 4f
@@ -268,8 +268,9 @@
 	sub	%g0, EFAULT, %g2
 	brnz,a,pt %g1, 1f
 	 st	%g2, [%g1]
-1:	retl
-	 nop
+1:	sethi	%uhi(PAGE_OFFSET), %g4
+	retl
+	 sllx	%g4, 32, %g4
 
 	.section __ex_table
 	.align  4

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