diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-14 11:28:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-14 11:28:54 -0700 |
| commit | 3a2289a4a317e0290a8bc7af28c62c9830cb12e5 (patch) | |
| tree | f1230c3fd1025c118ba6b7263c4987b962a7288c /arch/m68k/lib/memcpy.c | |
| parent | ca5432010e45d7f809b441b0c1e85e84b039cd85 (diff) | |
| parent | 734c3ce3bd4d51c932893b9f6d32b9ded31acdff (diff) | |
| download | linux-3a2289a4a317e0290a8bc7af28c62c9830cb12e5.tar.bz2 | |
Merge branch 'for-linus-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: use kernel processor defines for conditional optimizations
m68knommu: create config options for CPU classes
m68knommu: fix linker script exported name sections
Diffstat (limited to 'arch/m68k/lib/memcpy.c')
| -rw-r--r-- | arch/m68k/lib/memcpy.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/m68k/lib/memcpy.c b/arch/m68k/lib/memcpy.c index 62182c81e91c..064889316974 100644 --- a/arch/m68k/lib/memcpy.c +++ b/arch/m68k/lib/memcpy.c @@ -34,8 +34,10 @@ void *memcpy(void *to, const void *from, size_t n) if (temp) { long *lto = to; const long *lfrom = from; -#if defined(__mc68020__) || defined(__mc68030__) || \ - defined(__mc68040__) || defined(__mc68060__) || defined(__mcpu32__) +#if defined(CONFIG_M68000) || defined(CONFIG_COLDFIRE) + for (; temp; temp--) + *lto++ = *lfrom++; +#else asm volatile ( " movel %2,%3\n" " andw #7,%3\n" @@ -56,9 +58,6 @@ void *memcpy(void *to, const void *from, size_t n) " jpl 4b" : "=a" (lfrom), "=a" (lto), "=d" (temp), "=&d" (temp1) : "0" (lfrom), "1" (lto), "2" (temp)); -#else - for (; temp; temp--) - *lto++ = *lfrom++; #endif to = lto; from = lfrom; |