Commit 50ff06d1 authored by Linus Torvalds's avatar Linus Torvalds

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix missing fold at end of checksums.
parents 959eb392 ae5de0ff
...@@ -165,8 +165,9 @@ csum_partial_end_cruft: ...@@ -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
...@@ -221,11 +221,12 @@ FUNC_NAME: /* %o0=src, %o1=dst, %o2=len, %o3=sum */ ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment