From: John Crispin <john@openwrt.org>
Date: Mon, 9 Feb 2015 12:10:46 +0000 (+0000)
Subject: kernel: copy mips_decompressor_memmove patch to 3.18/3.19
X-Git-Tag: reboot~4366
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7155ec719123e00a01b28dbe3863c081a8a40465;p=oweals%2Fopenwrt.git

kernel: copy mips_decompressor_memmove patch to 3.18/3.19

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 44339
---

diff --git a/target/linux/generic/patches-3.18/060-mips_decompressor_memmove.patch b/target/linux/generic/patches-3.18/060-mips_decompressor_memmove.patch
new file mode 100644
index 0000000000..d215b80ab2
--- /dev/null
+++ b/target/linux/generic/patches-3.18/060-mips_decompressor_memmove.patch
@@ -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;
++}
diff --git a/target/linux/generic/patches-3.19/060-mips_decompressor_memmove.patch b/target/linux/generic/patches-3.19/060-mips_decompressor_memmove.patch
new file mode 100644
index 0000000000..d215b80ab2
--- /dev/null
+++ b/target/linux/generic/patches-3.19/060-mips_decompressor_memmove.patch
@@ -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;
++}