Merge branch 'master' into gfs2

3 files changed, 5 insertions, 3 deletions

diff --git a/arch/sh/lib/checksum.S b/arch/sh/lib/checksum.S
index 7c50dfe68c07..cbdd0d40e545 100644
--- a/arch/sh/lib/checksum.S
+++ b/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.
diff --git a/arch/sh/lib/memcpy-sh4.S b/arch/sh/lib/memcpy-sh4.S
index db6b736537ad..560bc17eebdd 100644
--- a/arch/sh/lib/memcpy-sh4.S
+++ b/arch/sh/lib/memcpy-sh4.S
@@ -727,8 +727,8 @@ ENTRY(memcpy)
         mov.l   @(0x04,r5), r11 !  18 LS (latency=2)
         xtrct   r9, r8          !  48 EX
 
-        mov.w   @(0x02,r5), r12 !  18 LS (latency=2)
-        xtrct   r10, r9         !  48 EX
+        mov.l   @(0x00,r5), r12 !  18 LS (latency=2)
+        xtrct   r10, r9         !  48 EX
 
         movca.l r0,@r1          !  40 LS (latency=3-7)
         add     #-0x1c, r1      !  50 EX
diff --git a/arch/sh/lib/memset.S b/arch/sh/lib/memset.S
index 95670090680e..af91fe2b72a6 100644
--- a/arch/sh/lib/memset.S
+++ b/arch/sh/lib/memset.S
@@ -29,6 +29,7 @@ ENTRY(memset)
         bf/s    1b
          mov.b  r5,@-r4
 2:                              ! make VVVV
+        extu.b  r5,r5
         swap.b  r5,r0           !   V0
         or      r0,r5           !   VV
         swap.w  r5,r0           ! VV00