diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-01-18 09:25:27 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-01-18 09:25:27 +0000 |
commit | dc9e6416e7d60accd5974583540042d29e70f7b4 (patch) | |
tree | 47afa6a57b580bee608d723c888f5c365a9c7edc /target/linux/generic/patches-3.14/132-mips_inline_dma_ops.patch | |
parent | 9c995cf6d4126ce8031ca0804097c7d1f9c5fbb6 (diff) | |
download | upstream-dc9e6416e7d60accd5974583540042d29e70f7b4.tar.gz upstream-dc9e6416e7d60accd5974583540042d29e70f7b4.tar.bz2 upstream-dc9e6416e7d60accd5974583540042d29e70f7b4.zip |
kernel: backport upstream commit to fix MIPS cache shift with secondary cache enabled
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44024 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 6 |
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); |