aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-4.4/160-kmap_coherent.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-06-26 14:45:12 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2016-06-26 18:20:37 +0200
commit84d489f64f3b382d5544e342f66d8806e94e85d3 (patch)
treedca318969c99733fc177e8564ccad33beb4d2c58 /target/linux/brcm47xx/patches-4.4/160-kmap_coherent.patch
parent3bf35126733a4b4073c1d3388e226c2a8f79d65b (diff)
downloadupstream-84d489f64f3b382d5544e342f66d8806e94e85d3.tar.gz
upstream-84d489f64f3b382d5544e342f66d8806e94e85d3.tar.bz2
upstream-84d489f64f3b382d5544e342f66d8806e94e85d3.zip
kernel: update to version 4.4.14
Changelog: https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.14 Some manual changes to target/linux/generic/patches-4.4/610- netfilter_match_bypass_default_checks.patch were needed. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/brcm47xx/patches-4.4/160-kmap_coherent.patch')
-rw-r--r--target/linux/brcm47xx/patches-4.4/160-kmap_coherent.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-4.4/160-kmap_coherent.patch b/target/linux/brcm47xx/patches-4.4/160-kmap_coherent.patch
index 3d65fdfd62..af8c27a674 100644
--- a/target/linux/brcm47xx/patches-4.4/160-kmap_coherent.patch
+++ b/target/linux/brcm47xx/patches-4.4/160-kmap_coherent.patch
@@ -29,7 +29,7 @@ This fixes OpenWrt ticket #1485: https://dev.openwrt.org/ticket/1485
#endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
-@@ -600,7 +600,7 @@ static inline void local_r4k_flush_cache
+@@ -645,7 +645,7 @@ static inline void local_r4k_flush_cache
*/
map_coherent = (cpu_has_dc_aliases &&
page_mapped(page) && !Page_dcache_dirty(page));
@@ -38,7 +38,7 @@ This fixes OpenWrt ticket #1485: https://dev.openwrt.org/ticket/1485
vaddr = kmap_coherent(page, addr);
else
vaddr = kmap_atomic(page);
-@@ -625,7 +625,7 @@ static inline void local_r4k_flush_cache
+@@ -670,7 +670,7 @@ static inline void local_r4k_flush_cache
}
if (vaddr) {