Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

[sfrench/cifs-2.6.git] / arch / sh / lib / memcpy-sh4.S

diff --git a/arch/sh/lib/memcpy-sh4.S b/arch/sh/lib/memcpy-sh4.S
index db6b736537adf9ff7e46f7aa7d69bd8260a83a19..560bc17eebdd6748d1e49e40730a476b3cbe1c3a 100644 (file)
--- 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