diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-05 12:24:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-05 12:24:28 -0700 |
| commit | 50ff06d1546d7f492068dd5196c26bf2cc5080b1 (patch) | |
| tree | 8f63f671fd13ab3165c7dfead8b3be90c8355bd2 | |
| parent | 959eb39297e8c82f61fbfc283ad4ff11c883bf1e (diff) | |
| parent | ae5de0ff0bc24664a053109c6caa782ba2ad7c53 (diff) | |
| download | linux-50ff06d1546d7f492068dd5196c26bf2cc5080b1.tar.gz linux-50ff06d1546d7f492068dd5196c26bf2cc5080b1.tar.bz2 linux-50ff06d1546d7f492068dd5196c26bf2cc5080b1.zip | |
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.
| -rw-r--r-- | arch/sparc64/lib/checksum.S | 5 | ||||
| -rw-r--r-- | arch/sparc64/lib/csum_copy.S | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/arch/sparc64/lib/checksum.S b/arch/sparc64/lib/checksum.S index ba9cd3ccc2b2..1d230f693dc4 100644 --- a/arch/sparc64/lib/checksum.S +++ b/arch/sparc64/lib/checksum.S @@ -165,8 +165,9 @@ csum_partial_end_cruft: sll %g1, 8, %g1 or %o5, %g1, %o4 -1: add %o2, %o4, %o2 +1: addcc %o2, %o4, %o2 + addc %g0, %o2, %o2 csum_partial_finish: retl - mov %o2, %o0 + srl %o2, 0, %o0 diff --git a/arch/sparc64/lib/csum_copy.S b/arch/sparc64/lib/csum_copy.S index 71af48839064..e566c770a0f6 100644 --- a/arch/sparc64/lib/csum_copy.S +++ b/arch/sparc64/lib/csum_copy.S @@ -221,11 +221,12 @@ FUNC_NAME: /* %o0=src, %o1=dst, %o2=len, %o3=sum */ sll %g1, 8, %g1 or %o5, %g1, %o4 -1: add %o3, %o4, %o3 +1: addcc %o3, %o4, %o3 + addc %g0, %o3, %o3 70: retl - mov %o3, %o0 + srl %o3, 0, %o0 95: mov 0, GLOBAL_SPARE brlez,pn %o2, 4f |