projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-v3.11' of git://git.infradead.org/battery-2.6
[firefly-linux-kernel-4.4.55.git]
/
arch
/
m68k
/
lib
/
memcpy.c
diff --git
a/arch/m68k/lib/memcpy.c
b/arch/m68k/lib/memcpy.c
index 10ca051d56b83cd2b8c9263c01d8ef08cc7383e0..c1e2dfb206f3ff0f275da8539ed44b84fd298471 100644
(file)
--- a/
arch/m68k/lib/memcpy.c
+++ b/
arch/m68k/lib/memcpy.c
@@
-10,7
+10,7
@@
void *memcpy(void *to, const void *from, size_t n)
{
void *xto = to;
- size_t temp
, temp1
;
+ size_t temp;
if (!n)
return xto;
@@
-47,6
+47,7
@@
void *memcpy(void *to, const void *from, size_t n)
for (; temp; temp--)
*lto++ = *lfrom++;
#else
+ size_t temp1;
asm volatile (
" movel %2,%3\n"
" andw #7,%3\n"