diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:24:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:24:04 -0400 |
| commit | ac1d426e825ab5778995f2f6f053ca2e6b45c622 (patch) | |
| tree | 75b91356ca39463e0112931aa6790802fb1e07a2 /arch/microblaze/lib/memcpy.c | |
| parent | fda0e18c8a7a3e02747c2b045b4fcd2c920410b9 (diff) | |
| parent | a3685f00652af83f12b63e3b4ef48f29581ba48b (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/include/asm/system.h
arch/arm/mm/Kconfig
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. */ |