diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-06-12 17:53:34 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-12 17:53:34 +1000 |
| commit | 7a0c58d0513c246ac5438ef4a55ce8b93395ae0e (patch) | |
| tree | d18f58349ced242aa62e622e381e60933f71d451 /arch/sparc64/lib/checksum.S | |
| parent | 6218a761bbc27acc65248c80024875bcc06d52b1 (diff) | |
| parent | 289a1e995e74734b5ec76ca8a5490058f4fecc24 (diff) | |
| download | kernel_goldelico_gta04-7a0c58d0513c246ac5438ef4a55ce8b93395ae0e.zip kernel_goldelico_gta04-7a0c58d0513c246ac5438ef4a55ce8b93395ae0e.tar.gz kernel_goldelico_gta04-7a0c58d0513c246ac5438ef4a55ce8b93395ae0e.tar.bz2 | |
Merge branch 'merge'
Diffstat (limited to 'arch/sparc64/lib/checksum.S')
| -rw-r--r-- | arch/sparc64/lib/checksum.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sparc64/lib/checksum.S b/arch/sparc64/lib/checksum.S index ba9cd3c..1d230f6 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 |