aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14/132-mips_inline_dma_ops.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-01-18 09:25:27 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-01-18 09:25:27 +0000
commit216100edb423b22f48b9ac0cc00f8f3958aca776 (patch)
treef07110b30ae0f0abf1ddf9192709d6b4498ebbb1 /target/linux/generic/patches-3.14/132-mips_inline_dma_ops.patch
parent6dfea16ab9df0ff272e0d75a21cb441bbf781ce0 (diff)
downloadupstream-216100edb423b22f48b9ac0cc00f8f3958aca776.tar.gz
upstream-216100edb423b22f48b9ac0cc00f8f3958aca776.tar.bz2
upstream-216100edb423b22f48b9ac0cc00f8f3958aca776.zip
kernel: backport upstream commit to fix MIPS cache shift with secondary cache enabled
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 44024
Diffstat (limited to 'target/linux/generic/patches-3.14/132-mips_inline_dma_ops.patch')
-rw-r--r--target/linux/generic/patches-3.14/132-mips_inline_dma_ops.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.14/132-mips_inline_dma_ops.patch b/target/linux/generic/patches-3.14/132-mips_inline_dma_ops.patch
index e43de025e6..e8486c9a47 100644
--- a/target/linux/generic/patches-3.14/132-mips_inline_dma_ops.patch
+++ b/target/linux/generic/patches-3.14/132-mips_inline_dma_ops.patch
@@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -1620,6 +1620,9 @@ config SYS_HAS_CPU_XLR
+@@ -1621,6 +1621,9 @@ config SYS_HAS_CPU_XLR
config SYS_HAS_CPU_XLP
bool
@@ -510,7 +510,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr,
-@@ -159,8 +137,8 @@ void dma_free_noncoherent(struct device
+@@ -159,8 +137,8 @@ void dma_free_noncoherent(struct device
}
EXPORT_SYMBOL(dma_free_noncoherent);
@@ -650,7 +650,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
enum dma_data_direction direction)
-@@ -347,23 +225,10 @@ void dma_cache_sync(struct device *dev,
+@@ -347,23 +225,10 @@ void dma_cache_sync(struct device *dev,
EXPORT_SYMBOL(dma_cache_sync);