diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-20 15:59:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-20 15:59:54 -0400 |
| commit | 9fafbd806198eb690c9a9f9fe35a879db93a1b8d (patch) | |
| tree | a555f39102d51151d7f8461a4f575468cd52f33c /arch/sparc/lib | |
| parent | d81f087f1f1c1aacdb4f17224a554237285ddd11 (diff) | |
| parent | 21dccddf45aae2d9f973696ce06115da0d1012b6 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/sparc/lib')
| -rw-r--r-- | arch/sparc/lib/checksum_32.S | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/sparc/lib/checksum_32.S b/arch/sparc/lib/checksum_32.S index 3632cb34e914..0084c3361e15 100644 --- a/arch/sparc/lib/checksum_32.S +++ b/arch/sparc/lib/checksum_32.S | |||
| @@ -289,10 +289,16 @@ cc_end_cruft: | |||
| 289 | 289 | ||
| 290 | /* Also, handle the alignment code out of band. */ | 290 | /* Also, handle the alignment code out of band. */ |
| 291 | cc_dword_align: | 291 | cc_dword_align: |
| 292 | cmp %g1, 6 | 292 | cmp %g1, 16 |
| 293 | bl,a ccte | 293 | bge 1f |
| 294 | srl %g1, 1, %o3 | ||
| 295 | 2: cmp %o3, 0 | ||
| 296 | be,a ccte | ||
| 294 | andcc %g1, 0xf, %o3 | 297 | andcc %g1, 0xf, %o3 |
| 295 | andcc %o0, 0x1, %g0 | 298 | andcc %o3, %o0, %g0 ! Check %o0 only (%o1 has the same last 2 bits) |
| 299 | be,a 2b | ||
| 300 | srl %o3, 1, %o3 | ||
| 301 | 1: andcc %o0, 0x1, %g0 | ||
| 296 | bne ccslow | 302 | bne ccslow |
| 297 | andcc %o0, 0x2, %g0 | 303 | andcc %o0, 0x2, %g0 |
| 298 | be 1f | 304 | be 1f |