kernel: copy mips_decompressor_memmove patch to 3.18/3.19
authorJohn Crispin <john@openwrt.org>
Mon, 9 Feb 2015 12:10:46 +0000 (12:10 +0000)
committerJohn Crispin <john@openwrt.org>
Mon, 9 Feb 2015 12:10:46 +0000 (12:10 +0000)
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 44339

target/linux/generic/patches-3.18/060-mips_decompressor_memmove.patch [new file with mode: 0644]
target/linux/generic/patches-3.19/060-mips_decompressor_memmove.patch [new file with mode: 0644]

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 (file)
index 0000000..d215b80
--- /dev/null
@@ -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 (file)
index 0000000..d215b80
--- /dev/null
@@ -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;
++}