summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2012-10-29 07:15:43 +0100
committerGreg Ungerer <gerg@uclinux.org>2012-12-05 01:51:23 +0100
commit423c01eac31fe9e6c9eee7bf45ace9abcd57251b (patch)
treef535d95958f6eb208f6e7f44c1e136df45e087fa
parentm68knommu: make non-MMU page_to_virt() return a void * (diff)
downloadlinux-423c01eac31fe9e6c9eee7bf45ace9abcd57251b.tar.xz
linux-423c01eac31fe9e6c9eee7bf45ace9abcd57251b.zip
m68k: fix unused variable warning in mempcy.c
When compiling for original 68000 or ColdFire targets you will get the following warning when compiling arch/m68k/lib/memcpy.c: CC arch/m68k/lib/memcpy.o arch/m68k/lib/memcpy.c: In function ‘__builtin_memcpy’: arch/m68k/lib/memcpy.c:13:15: warning: unused variable ‘temp1’ This is easily fixed by moving the definition of temp1 into the code block where it is used. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
-rw-r--r--arch/m68k/lib/memcpy.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/lib/memcpy.c b/arch/m68k/lib/memcpy.c
index 10ca051d56b8..c1e2dfb206f3 100644
--- 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"