Commit c6f7e151 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull sparc64 csum fix from Al Viro:
 "Fix for a brown paperbag regression in sparc64"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  [regression fix] really dumb fuckup in sparc64 __csum_partial_copy() changes
parents 1a0e1943 6220e48d

arch/sparc/lib/csum_copy.S

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
FUNC_NAME:		/* %o0=src, %o1=dst, %o2=len */

	LOAD(prefetch, %o0 + 0x000, #n_reads)

	xor		%o0, %o1, %g1

	mov		1, %o3

	mov		-1, %o3

	clr		%o4

	andcc		%g1, 0x3, %g0

	bne,pn		%icc, 95f

CRA Git | Maintained and supported by SUSTech CRA and CCSE