mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-30 21:44:27 -04:00
5e3d188e89
The select SYS_HAS_DMA_OPS in CPU_CAVIUM_OCTEON was from the kernel patch in 3.13, but it is only included in kernel 3.14 and not in 3.13 and 3.18, add it again. Thank you swalker for spotting this. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 43134
23 lines
472 B
Diff
23 lines
472 B
Diff
--- a/arch/mips/boot/compressed/string.c
|
|
+++ b/arch/mips/boot/compressed/string.c
|
|
@@ -26,3 +26,19 @@ void *memset(void *s, int c, size_t n)
|
|
ss[i] = c;
|
|
return s;
|
|
}
|
|
+
|
|
+void *memmove(void *__dest, __const void *__src, size_t count)
|
|
+{
|
|
+ unsigned char *d = __dest;
|
|
+ const unsigned char *s = __src;
|
|
+
|
|
+ if (__dest == __src)
|
|
+ return __dest;
|
|
+
|
|
+ if (__dest < __src)
|
|
+ return memcpy(__dest, __src, count);
|
|
+
|
|
+ while (count--)
|
|
+ d[count] = s[count];
|
|
+ return __dest;
|
|
+}
|