aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14/063-mips_decompressor_memmove.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-10-31 23:32:22 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-10-31 23:32:22 +0000
commit5e3d188e89d719c8949f4f16321d82cc63ca8529 (patch)
tree4303736a67e1acfb1a51dd626636f44b09955ea0 /target/linux/generic/patches-3.14/063-mips_decompressor_memmove.patch
parentb63cfc95302367d4900d68364fcf66c4074ab112 (diff)
downloadupstream-5e3d188e89d719c8949f4f16321d82cc63ca8529.tar.gz
upstream-5e3d188e89d719c8949f4f16321d82cc63ca8529.tar.bz2
upstream-5e3d188e89d719c8949f4f16321d82cc63ca8529.zip
kernel: add patch header and missing part in 132-mips_inline_dma_ops.patch again
The select SYS_HAS_DMA_OPS in CPU_CAVIUM_OCTEON was from the kernel patch in 3.13, but it is only included in kernel 3.14 and not in 3.13 and 3.18, add it again. Thank you swalker for spotting this. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 43134
Diffstat (limited to 'target/linux/generic/patches-3.14/063-mips_decompressor_memmove.patch')
-rw-r--r--target/linux/generic/patches-3.14/063-mips_decompressor_memmove.patch8
1 files changed, 3 insertions, 5 deletions
diff --git a/target/linux/generic/patches-3.14/063-mips_decompressor_memmove.patch b/target/linux/generic/patches-3.14/063-mips_decompressor_memmove.patch
index 501e11ab47..d215b80ab2 100644
--- a/target/linux/generic/patches-3.14/063-mips_decompressor_memmove.patch
+++ b/target/linux/generic/patches-3.14/063-mips_decompressor_memmove.patch
@@ -1,8 +1,6 @@
-Index: linux-3.14.16/arch/mips/boot/compressed/string.c
-===================================================================
---- linux-3.14.16.orig/arch/mips/boot/compressed/string.c 2014-08-07 16:50:59.000000000 -0700
-+++ linux-3.14.16/arch/mips/boot/compressed/string.c 2014-10-23 16:42:01.015003995 -0700
-@@ -26,3 +26,19 @@
+--- 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;
}