diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /arch/sh/lib/memcpy-sh4.S | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'arch/sh/lib/memcpy-sh4.S')
| -rw-r--r-- | arch/sh/lib/memcpy-sh4.S | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
| 727 | mov.l @(0x04,r5), r11 ! 18 LS (latency=2) | 727 | mov.l @(0x04,r5), r11 ! 18 LS (latency=2) |
| 728 | xtrct r9, r8 ! 48 EX | 728 | xtrct r9, r8 ! 48 EX |
| 729 | 729 | ||
| 730 | mov.w @(0x02,r5), r12 ! 18 LS (latency=2) | 730 | mov.l @(0x00,r5), r12 ! 18 LS (latency=2) |
| 731 | xtrct r10, r9 ! 48 EX | 731 | xtrct r10, r9 ! 48 EX |
| 732 | 732 | ||
| 733 | movca.l r0,@r1 ! 40 LS (latency=3-7) | 733 | movca.l r0,@r1 ! 40 LS (latency=3-7) |
| 734 | add #-0x1c, r1 ! 50 EX | 734 | add #-0x1c, r1 ! 50 EX |