lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

Browse Source 
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix missing fold at end of checksums.
This commit is contained in:
Linus Torvalds
2006-06-05 12:24:28 -07:00
parent 959eb39297 ae5de0ff0b
commit 50ff06d154
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/sparc64/lib/checksum.S
View File

@@ -165,8 +165,9 @@ csum_partial_end_cruft:
sll %g1, 8, %g1 sll %g1, 8, %g1
or %o5, %g1, %o4 or %o5, %g1, %o4
1: add %o2, %o4, %o2 1: addcc %o2, %o4, %o2
addc %g0, %o2, %o2
csum_partial_finish: csum_partial_finish:
retl retl
mov %o2, %o0 srl %o2, 0, %o0

5
arch/sparc64/lib/csum_copy.S
View File

@@ -221,11 +221,12 @@ FUNC_NAME: /* %o0=src, %o1=dst, %o2=len, %o3=sum */
sll %g1, 8, %g1 sll %g1, 8, %g1
or %o5, %g1, %o4 or %o5, %g1, %o4
1: add %o3, %o4, %o3 1: addcc %o3, %o4, %o3
addc %g0, %o3, %o3
70: 70:
retl retl
mov %o3, %o0 srl %o3, 0, %o0
95: mov 0, GLOBAL_SPARE 95: mov 0, GLOBAL_SPARE
brlez,pn %o2, 4f brlez,pn %o2, 4f