diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
| commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
| tree | fcf504879883763557e696eff81427b1ab78f76b /arch/microblaze/lib/memcpy.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'arch/microblaze/lib/memcpy.c')
| -rw-r--r-- | arch/microblaze/lib/memcpy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/lib/memcpy.c b/arch/microblaze/lib/memcpy.c index cc2108b6b260..014bac92bdff 100644 --- a/arch/microblaze/lib/memcpy.c +++ b/arch/microblaze/lib/memcpy.c | |||
| @@ -53,7 +53,7 @@ void *memcpy(void *v_dst, const void *v_src, __kernel_size_t c) | |||
| 53 | const uint32_t *i_src; | 53 | const uint32_t *i_src; |
| 54 | uint32_t *i_dst; | 54 | uint32_t *i_dst; |
| 55 | 55 | ||
| 56 | if (c >= 4) { | 56 | if (likely(c >= 4)) { |
| 57 | unsigned value, buf_hold; | 57 | unsigned value, buf_hold; |
| 58 | 58 | ||
| 59 | /* Align the dstination to a word boundry. */ | 59 | /* Align the dstination to a word boundry. */ |