diff options
Diffstat (limited to 'target/linux/generic/backport-5.4')
2 files changed, 7 insertions, 13 deletions
diff --git a/target/linux/generic/backport-5.4/300-MIPS-Exclude-more-dsemul-code-when-CONFIG_MIPS_FP_SU.patch b/target/linux/generic/backport-5.4/300-MIPS-Exclude-more-dsemul-code-when-CONFIG_MIPS_FP_SU.patch index 1be051e1df..0bc58e756b 100644 --- a/target/linux/generic/backport-5.4/300-MIPS-Exclude-more-dsemul-code-when-CONFIG_MIPS_FP_SU.patch +++ b/target/linux/generic/backport-5.4/300-MIPS-Exclude-more-dsemul-code-when-CONFIG_MIPS_FP_SU.patch @@ -13,8 +13,6 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> arch/mips/kernel/vdso.c | 26 +++++++++++++++----------- 3 files changed, 29 insertions(+), 19 deletions(-) -diff --git a/arch/mips/include/asm/processor.h b/arch/mips/include/asm/processor.h -index 7619ad319400..813ba94d87bb 100644 --- a/arch/mips/include/asm/processor.h +++ b/arch/mips/include/asm/processor.h @@ -253,13 +253,13 @@ struct thread_struct { @@ -56,11 +54,9 @@ index 7619ad319400..813ba94d87bb 100644 /* \ * Saved DSP stuff \ */ \ -diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c -index 339870ed92f7..b2a797557825 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c -@@ -75,7 +75,9 @@ void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp) +@@ -75,7 +75,9 @@ void start_thread(struct pt_regs * regs, lose_fpu(0); clear_thread_flag(TIF_MSA_CTX_LIVE); clear_used_math(); @@ -70,7 +66,7 @@ index 339870ed92f7..b2a797557825 100644 init_dsp(); regs->cp0_epc = pc; regs->regs[29] = sp; -@@ -176,7 +178,9 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long usp, +@@ -176,7 +178,9 @@ int copy_thread_tls(unsigned long clone_ clear_tsk_thread_flag(p, TIF_FPUBOUND); #endif /* CONFIG_MIPS_MT_FPAFF */ @@ -93,8 +89,6 @@ index 339870ed92f7..b2a797557825 100644 /* Space for the VDSO, data page & GIC user page */ top -= PAGE_ALIGN(current->thread.abi->vdso->size); -diff --git a/arch/mips/kernel/vdso.c b/arch/mips/kernel/vdso.c -index bc35f8499111..3adb7354bc01 100644 --- a/arch/mips/kernel/vdso.c +++ b/arch/mips/kernel/vdso.c @@ -71,10 +71,12 @@ subsys_initcall(init_vdso); @@ -113,7 +107,7 @@ index bc35f8499111..3adb7354bc01 100644 if (current->flags & PF_RANDOMIZE) { base += get_random_int() & (VDSO_RANDOMIZE_SIZE - 1); -@@ -95,14 +97,16 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) +@@ -95,14 +97,16 @@ int arch_setup_additional_pages(struct l if (down_write_killable(&mm->mmap_sem)) return -EINTR; diff --git a/target/linux/generic/backport-5.4/745-v5.7-net-dsa-mt7530-add-support-for-port-mirroring.patch b/target/linux/generic/backport-5.4/745-v5.7-net-dsa-mt7530-add-support-for-port-mirroring.patch index 39e351e279..4185547264 100644 --- a/target/linux/generic/backport-5.4/745-v5.7-net-dsa-mt7530-add-support-for-port-mirroring.patch +++ b/target/linux/generic/backport-5.4/745-v5.7-net-dsa-mt7530-add-support-for-port-mirroring.patch @@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -1222,6 +1222,64 @@ mt7530_port_vlan_del(struct dsa_switch *ds, int port, +@@ -1222,6 +1222,64 @@ mt7530_port_vlan_del(struct dsa_switch * return 0; } @@ -80,9 +80,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net> +} + static enum dsa_tag_protocol - mtk_get_tag_protocol(struct dsa_switch *ds, int port, - enum dsa_tag_protocol mp) -@@ -1613,6 +1671,8 @@ static const struct dsa_switch_ops mt7530_switch_ops = { + mtk_get_tag_protocol(struct dsa_switch *ds, int port) + { +@@ -1606,6 +1664,8 @@ static const struct dsa_switch_ops mt753 .port_vlan_prepare = mt7530_port_vlan_prepare, .port_vlan_add = mt7530_port_vlan_add, .port_vlan_del = mt7530_port_vlan_del, |