aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm47xx
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2020-04-17 14:29:33 +0200
committerPetr Štetiar <ynezz@true.cz>2020-04-17 15:18:12 +0200
commit23916bca61435ee80236f6aef70a3f0acacd4a93 (patch)
treeab3dc6705b08a3946a57b33c7f9f4aa835534292 /target/linux/bcm47xx
parent0495324b9bd0b6a976ea731a1b4b77b26df32ee6 (diff)
downloadupstream-23916bca61435ee80236f6aef70a3f0acacd4a93.tar.gz
upstream-23916bca61435ee80236f6aef70a3f0acacd4a93.tar.bz2
upstream-23916bca61435ee80236f6aef70a3f0acacd4a93.zip
kernel: bump 5.4 to 5.4.33
Refreshed patches, removed upstreamed patches: oxnas: 001-irqchip-versatile-fpga-Handle-chained-IRQs-properly.patch oxnas: 002-irqchip-versatile-fpga-Apply-clear-mask-earlier.patch Run tested: qemu-x86-64, apalis Build tested: x86/64, imx6, sunxi/a53 Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/bcm47xx')
-rw-r--r--target/linux/bcm47xx/patches-5.4/159-cpu_fixes.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm47xx/patches-5.4/159-cpu_fixes.patch b/target/linux/bcm47xx/patches-5.4/159-cpu_fixes.patch
index 2c048071a3..1c98d6b4e4 100644
--- a/target/linux/bcm47xx/patches-5.4/159-cpu_fixes.patch
+++ b/target/linux/bcm47xx/patches-5.4/159-cpu_fixes.patch
@@ -470,7 +470,7 @@
uasm_i_eret(&p); /* return from trap */
}
#ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT
-@@ -2049,6 +2058,9 @@ build_r4000_tlbchange_handler_head(u32 *
+@@ -2052,6 +2061,9 @@ build_r4000_tlbchange_handler_head(u32 *
#ifdef CONFIG_64BIT
build_get_pmde64(p, l, r, wr.r1, wr.r2); /* get pmd in ptr */
#else
@@ -480,7 +480,7 @@
build_get_pgde32(p, wr.r1, wr.r2); /* get pgd in ptr */
#endif
-@@ -2095,6 +2107,9 @@ build_r4000_tlbchange_handler_tail(u32 *
+@@ -2098,6 +2110,9 @@ build_r4000_tlbchange_handler_tail(u32 *
build_tlb_write_entry(p, l, r, tlb_indexed);
uasm_l_leave(l, *p);
build_restore_work_registers(p);