diff options
| author | John Audia <therealgraysky@proton.me> | 2023-02-25 16:20:28 -0500 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-03-27 18:57:41 +0200 |
| commit | 26cc831e44970e82e5c4e8de646d66c9e621e7b1 (patch) | |
| tree | 7042bccbc7ee76a0587221e5d2c34dd3f9866762 /target/linux/bcm47xx | |
| parent | 28e5045f3abab56fe31a0425de58e604218ebb86 (diff) | |
| download | upstream-26cc831e44970e82e5c4e8de646d66c9e621e7b1.tar.gz upstream-26cc831e44970e82e5c4e8de646d66c9e621e7b1.tar.bz2 upstream-26cc831e44970e82e5c4e8de646d66c9e621e7b1.zip | |
kernel: bump 5.10 to 5.10.169
Add fix:
target/linux/generic/backport-5.10/804-0001-net-Remove-WARN_ON_ONCE-sk-sk_forward_alloc-from-sk_.patch[3]
All other patches automatically rebased.
3. https://lore.kernel.org/stable/20230227211548.13923-1-kuniyu@amazon.com
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit b88955aa2294c61f21bdf7014e10d8ea29d0c346)
Diffstat (limited to 'target/linux/bcm47xx')
| -rw-r--r-- | target/linux/bcm47xx/patches-5.10/159-cpu_fixes.patch | 6 | ||||
| -rw-r--r-- | target/linux/bcm47xx/patches-5.10/160-kmap_coherent.patch | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/bcm47xx/patches-5.10/159-cpu_fixes.patch b/target/linux/bcm47xx/patches-5.10/159-cpu_fixes.patch index 0c9a9d6490..eb4c0e6ac8 100644 --- a/target/linux/bcm47xx/patches-5.10/159-cpu_fixes.patch +++ b/target/linux/bcm47xx/patches-5.10/159-cpu_fixes.patch @@ -389,7 +389,7 @@ if (dc_lsize == 0) r4k_blast_dcache = (void *)cache_noop; else if (dc_lsize == 16) -@@ -1818,6 +1830,17 @@ static void coherency_setup(void) +@@ -1827,6 +1839,17 @@ static void coherency_setup(void) * silly idea of putting something else there ... */ switch (current_cpu_type()) { @@ -407,7 +407,7 @@ case CPU_R4000PC: case CPU_R4000SC: case CPU_R4000MC: -@@ -1864,6 +1887,15 @@ void r4k_cache_init(void) +@@ -1873,6 +1896,15 @@ void r4k_cache_init(void) extern void build_copy_page(void); struct cpuinfo_mips *c = ¤t_cpu_data; @@ -423,7 +423,7 @@ probe_pcache(); probe_vcache(); setup_scache(); -@@ -1940,7 +1972,15 @@ void r4k_cache_init(void) +@@ -1949,7 +1981,15 @@ void r4k_cache_init(void) */ local_r4k___flush_cache_all(NULL); diff --git a/target/linux/bcm47xx/patches-5.10/160-kmap_coherent.patch b/target/linux/bcm47xx/patches-5.10/160-kmap_coherent.patch index caa3d9816b..c85fa0be4c 100644 --- a/target/linux/bcm47xx/patches-5.10/160-kmap_coherent.patch +++ b/target/linux/bcm47xx/patches-5.10/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) { |