summaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-3.6/100-decompressor_memcpy_fix.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-11-11 18:41:09 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-11-11 18:41:09 +0000
commite58dc6f93a9d2170530c811acedd1aa99c9df401 (patch)
tree7e70f06b761a1abdb0d07527569d68020208e225 /target/linux/ar7/patches-3.6/100-decompressor_memcpy_fix.patch
parentcfe387e3516ed9c774405e447fb31e65e224ae62 (diff)
[ar7] add support for Linux 3.6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34154 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 000000000..56c8b3160
--- /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;