tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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.

Linus Torvalds 50ff06d1 959eb392

+6 -4
unified split
+3 -2
arch/sparc64/lib/checksum.S
··· 165 165 sll %g1, 8, %g1 166 166 or %o5, %g1, %o4 167 167 168 - 1: add %o2, %o4, %o2 168 + 1: addcc %o2, %o4, %o2 169 + addc %g0, %o2, %o2 169 170 170 171 csum_partial_finish: 171 172 retl 172 - mov %o2, %o0 173 + srl %o2, 0, %o0
+3 -2
arch/sparc64/lib/csum_copy.S
··· 221 221 sll %g1, 8, %g1 222 222 or %o5, %g1, %o4 223 223 224 - 1: add %o3, %o4, %o3 224 + 1: addcc %o3, %o4, %o3 225 + addc %g0, %o3, %o3 225 226 226 227 70: 227 228 retl 228 - mov %o3, %o0 229 + srl %o3, 0, %o0 229 230 230 231 95: mov 0, GLOBAL_SPARE 231 232 brlez,pn %o2, 4f