diff --git a/[refs] b/[refs] index b2b9f1af2725..5902ea3cb2c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b395265f81817385f12e62f03f795efb732a445 +refs/heads/master: 24ab54cb49c099d691c68fdd1ac6a0c2f5177da4 diff --git a/trunk/arch/sh/lib/checksum.S b/trunk/arch/sh/lib/checksum.S index 7c50dfe68c07..cbdd0d40e545 100644 --- a/trunk/arch/sh/lib/checksum.S +++ b/trunk/arch/sh/lib/checksum.S @@ -202,8 +202,9 @@ ENTRY(csum_partial_copy_generic) cmp/pz r6 ! Jump if we had at least two bytes. bt/s 1f clrt + add #2,r6 ! r6 was < 2. Deal with it. bra 4f - add #2,r6 ! r6 was < 2. Deal with it. + mov r6,r2 3: ! Handle different src and dest alignments. ! This is not common, so simple byte by byte copy will do.