aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-4.19/160-kmap_coherent.patch
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2019-01-17 01:01:18 +0200
committerStijn Tintel <stijn@linux-ipv6.be>2019-01-17 03:04:13 +0200
commita37098a2d013f89a97ee001d5fb0980e538d2dee (patch)
treedc6dd90582fd78f3b69364328f4415a9dfcb4dd7 /target/linux/brcm47xx/patches-4.19/160-kmap_coherent.patch
parent76cc7665211266c810e59ebd74b810f69aaf8706 (diff)
downloadupstream-a37098a2d013f89a97ee001d5fb0980e538d2dee.tar.gz
upstream-a37098a2d013f89a97ee001d5fb0980e538d2dee.tar.bz2
upstream-a37098a2d013f89a97ee001d5fb0980e538d2dee.zip
kernel: bump 4.19 to 4.19.16
Refresh patches. Remove upstreamed patches: - backport/096-mips-math-emu-Write-protect-delay-slot-emulation-pages.patch - backport/096-v4.20-netfilter-ipv6-Preserve-link-scope-traffic-original-.patch - backport/424-v4.20-net-dsa-fix-88e6060-roaming.patch - hack/100-mtd-rawnand-qcom-fix-memory-corruption-that-causes-p.patch - pending/510-f2fs-fix-sanity_check_raw_super-on-big-endian-machines.patch Update patch that no longer applies: - backport/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch Compile-tested: mesongx Runtime-tested: mesongx Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/brcm47xx/patches-4.19/160-kmap_coherent.patch')
-rw-r--r--target/linux/brcm47xx/patches-4.19/160-kmap_coherent.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-4.19/160-kmap_coherent.patch b/target/linux/brcm47xx/patches-4.19/160-kmap_coherent.patch
index f7f4d3eaa5..db5660bc32 100644
--- a/target/linux/brcm47xx/patches-4.19/160-kmap_coherent.patch
+++ b/target/linux/brcm47xx/patches-4.19/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
-@@ -672,7 +672,7 @@ static inline void local_r4k_flush_cache
+@@ -694,7 +694,7 @@ static inline void local_r4k_flush_cache
map_coherent = (cpu_has_dc_aliases &&
page_mapcount(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);
-@@ -697,7 +697,7 @@ static inline void local_r4k_flush_cache
+@@ -719,7 +719,7 @@ static inline void local_r4k_flush_cache
}
if (vaddr) {