aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-3.6/100-decompressor_memcpy_fix.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-11-11 18:41:09 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-11-11 18:41:09 +0000
commitb363a7e4918327119b812ada6641b21bd84e0e04 (patch)
treebf353b93ca5fb2a3fa6d47e8b6b7ee03fe928f17 /target/linux/ar7/patches-3.6/100-decompressor_memcpy_fix.patch
parent854c5047814d6eb446cc26b6b742cd6abe10e183 (diff)
downloadupstream-b363a7e4918327119b812ada6641b21bd84e0e04.tar.gz
upstream-b363a7e4918327119b812ada6641b21bd84e0e04.tar.bz2
upstream-b363a7e4918327119b812ada6641b21bd84e0e04.zip
add support for Linux 3.6
SVN-Revision: 34154
Diffstat (limited to 'target/linux/ar7/patches-3.6/100-decompressor_memcpy_fix.patch')
-rw-r--r--target/linux/ar7/patches-3.6/100-decompressor_memcpy_fix.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/target/linux/ar7/patches-3.6/100-decompressor_memcpy_fix.patch b/target/linux/ar7/patches-3.6/100-decompressor_memcpy_fix.patch
new file mode 100644
index 0000000000..56c8b31603
--- /dev/null
+++ b/target/linux/ar7/patches-3.6/100-decompressor_memcpy_fix.patch
@@ -0,0 +1,12 @@
+--- a/arch/mips/boot/compressed/decompress.c
++++ b/arch/mips/boot/compressed/decompress.c
+@@ -44,6 +44,9 @@ void error(char *x)
+ #define STATIC static
+
+ #ifdef CONFIG_KERNEL_GZIP
++#ifdef memcpy
++#undef memcpy
++#endif
+ void *memcpy(void *dest, const void *src, size_t n)
+ {
+ int i;