diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /arch/sh/lib64 | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'arch/sh/lib64')
| -rw-r--r-- | arch/sh/lib64/copy_user_memcpy.S | 2 | ||||
| -rw-r--r-- | arch/sh/lib64/memcpy.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/lib64/copy_user_memcpy.S b/arch/sh/lib64/copy_user_memcpy.S index 2a62816d2ddd..49aeabeba2c2 100644 --- a/arch/sh/lib64/copy_user_memcpy.S +++ b/arch/sh/lib64/copy_user_memcpy.S | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | ! 2.: When there are two or three bytes in the last word of an 11-or-more | 27 | ! 2.: When there are two or three bytes in the last word of an 11-or-more |
| 28 | ! bytes memory chunk to b copied, the rest of the word can be read | 28 | ! bytes memory chunk to b copied, the rest of the word can be read |
| 29 | ! without side effects. | 29 | ! without side effects. |
| 30 | ! This could be easily changed by increasing the minumum size of | 30 | ! This could be easily changed by increasing the minimum size of |
| 31 | ! a fast memcpy and the amount subtracted from r7 before L_2l_loop be 2, | 31 | ! a fast memcpy and the amount subtracted from r7 before L_2l_loop be 2, |
| 32 | ! however, this would cost a few extra cyles on average. | 32 | ! however, this would cost a few extra cyles on average. |
| 33 | ! For SHmedia, the assumption is that any quadword can be read in its | 33 | ! For SHmedia, the assumption is that any quadword can be read in its |
diff --git a/arch/sh/lib64/memcpy.S b/arch/sh/lib64/memcpy.S index dd300c372ce1..5d682e0ee24f 100644 --- a/arch/sh/lib64/memcpy.S +++ b/arch/sh/lib64/memcpy.S | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | ! 2.: When there are two or three bytes in the last word of an 11-or-more | 29 | ! 2.: When there are two or three bytes in the last word of an 11-or-more |
| 30 | ! bytes memory chunk to b copied, the rest of the word can be read | 30 | ! bytes memory chunk to b copied, the rest of the word can be read |
| 31 | ! without side effects. | 31 | ! without side effects. |
| 32 | ! This could be easily changed by increasing the minumum size of | 32 | ! This could be easily changed by increasing the minimum size of |
| 33 | ! a fast memcpy and the amount subtracted from r7 before L_2l_loop be 2, | 33 | ! a fast memcpy and the amount subtracted from r7 before L_2l_loop be 2, |
| 34 | ! however, this would cost a few extra cyles on average. | 34 | ! however, this would cost a few extra cyles on average. |
| 35 | ! For SHmedia, the assumption is that any quadword can be read in its | 35 | ! For SHmedia, the assumption is that any quadword can be read in its |