kernel: copy mips_decompressor_memmove patch to 3.18/3.19
Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44339 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
247ab2bfb3
commit
4d12e544b8
|
@ -0,0 +1,22 @@
|
||||||
|
--- 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;
|
||||||
|
+}
|
|
@ -0,0 +1,22 @@
|
||||||
|
--- 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;
|
||||||
|
+}
|
Loading…
Reference in New Issue