diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-11 14:13:46 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-11 14:13:46 -0500 |
commit | 0969d11e201b82d30a158ccdb3aca67a7b845613 (patch) | |
tree | 25273891ff5ac341d5c65ee0f82fc0a55aa8cfb6 /arch/microblaze/lib/memmove.c | |
parent | 16ee8db6a93ffbc021132599f33288613f042c3d (diff) | |
parent | d15be32c30e6108cdab76ca895a19b5f8b88b5ca (diff) |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: remove obsolete DEBUG_BOOTMEM
microblaze: trivial: Fix removed the part of line
microblaze: Fix __muldi3 function for little-endian.
microblaze: Clear i/dcache for sw breakpoints
microblaze: Remove useless early_init_dt_check_for_initrd
microblaze: Fix unaligned exception for little endian platform
microblaze: Add PVR for Microblaze v8.00.b
microblaze: Correct PVR access macros
Revert "microblaze: Simplify syscall rutine"
microblaze: Fix initramfs
arch/microblaze: Remove unnecessary semicolons
Diffstat (limited to 'arch/microblaze/lib/memmove.c')
-rw-r--r-- | arch/microblaze/lib/memmove.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/lib/memmove.c b/arch/microblaze/lib/memmove.c index 123e3616f2dd..810fd68775e3 100644 --- a/arch/microblaze/lib/memmove.c +++ b/arch/microblaze/lib/memmove.c | |||
@@ -182,7 +182,7 @@ void *memmove(void *v_dst, const void *v_src, __kernel_size_t c) | |||
182 | for (; c >= 4; c -= 4) { | 182 | for (; c >= 4; c -= 4) { |
183 | value = *--i_src; | 183 | value = *--i_src; |
184 | *--i_dst = buf_hold | ((value & 0xFF000000)>> 24); | 184 | *--i_dst = buf_hold | ((value & 0xFF000000)>> 24); |
185 | buf_hold = (value & 0xFFFFFF) << 8;; | 185 | buf_hold = (value & 0xFFFFFF) << 8; |
186 | } | 186 | } |
187 | #endif | 187 | #endif |
188 | /* Realign the source */ | 188 | /* Realign the source */ |