aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm47xx/patches-5.15/160-kmap_coherent.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2023-03-05 18:42:49 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2023-03-05 18:47:12 +0100
commita7e05caaf3e215981dde82881259465c682df039 (patch)
tree50e2a18f528cf0e69101b6f70a3f1933f446671b /target/linux/bcm47xx/patches-5.15/160-kmap_coherent.patch
parent477ff0821a5e532adc0861d4093029967f5e1178 (diff)
downloadupstream-a7e05caaf3e215981dde82881259465c682df039.tar.gz
upstream-a7e05caaf3e215981dde82881259465c682df039.tar.bz2
upstream-a7e05caaf3e215981dde82881259465c682df039.zip
bcm47xx: Refresh patches
The kernel patches did not apply cleanly any more, refresh them automatically. Fixes: 26bc8f68767e ("generic: MIPS: Add barriers between dcache & icache flushes") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/bcm47xx/patches-5.15/160-kmap_coherent.patch')
-rw-r--r--target/linux/bcm47xx/patches-5.15/160-kmap_coherent.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm47xx/patches-5.15/160-kmap_coherent.patch b/target/linux/bcm47xx/patches-5.15/160-kmap_coherent.patch
index b716f0cbc8..aedf6afa24 100644
--- a/target/linux/bcm47xx/patches-5.15/160-kmap_coherent.patch
+++ b/target/linux/bcm47xx/patches-5.15/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
-@@ -699,7 +699,7 @@ static inline void local_r4k_flush_cache
+@@ -702,7 +702,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);
-@@ -721,7 +721,7 @@ static inline void local_r4k_flush_cache
+@@ -729,7 +729,7 @@ static inline void local_r4k_flush_cache
}
if (vaddr) {