Fixes for 4.4

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.4/fix-a-braino-in-sparc32-fix-register-window-handling.patch b/queue-4.4/fix-a-braino-in-sparc32-fix-register-window-handling.patch
new file mode 100644 (file)
index 0000000..ee7e096
--- /dev/null
+++ b/queue-4.4/fix-a-braino-in-sparc32-fix-register-window-handling.patch
@@ -0,0 +1,46 @@
+From 61d1576b9437cec2f2063becd9736d76dd1aa1d7 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Sat, 6 Jun 2020 23:44:24 -0400
+Subject: fix a braino in "sparc32: fix register window handling in
+ genregs32_[gs]et()"
+
+From: Al Viro <viro@zeniv.linux.org.uk>
+
+[ Upstream commit 9d964e1b82d8182184153b70174f445ea616f053 ]
+
+lost npc in PTRACE_SETREGSET, breaking PTRACE_SETREGS as well
+
+Fixes: cf51e129b968 "sparc32: fix register window handling in genregs32_[gs]et()"
+Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/sparc/kernel/ptrace_32.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/arch/sparc/kernel/ptrace_32.c b/arch/sparc/kernel/ptrace_32.c
+index 396dbdea0cfa0..2f4316c142664 100644
+--- a/arch/sparc/kernel/ptrace_32.c
++++ b/arch/sparc/kernel/ptrace_32.c
+@@ -167,12 +167,17 @@ static int genregs32_set(struct task_struct *target,
+       if (ret || !count)
+               return ret;
+       ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
+-                               &regs->y,
++                               &regs->npc,
+                                34 * sizeof(u32), 35 * sizeof(u32));
+       if (ret || !count)
+               return ret;
++      ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
++                               &regs->y,
++                               35 * sizeof(u32), 36 * sizeof(u32));
++      if (ret || !count)
++              return ret;
+       return user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
+-                                       35 * sizeof(u32), 38 * sizeof(u32));
++                                       36 * sizeof(u32), 38 * sizeof(u32));
+ }
+ 
+ static int fpregs32_get(struct task_struct *target,
+-- 
+2.25.1
+

diff --git a/queue-4.4/net-sched-export-__netdev_watchdog_up.patch b/queue-4.4/net-sched-export-__netdev_watchdog_up.patch
new file mode 100644 (file)
index 0000000..a8866be
--- /dev/null
+++ b/queue-4.4/net-sched-export-__netdev_watchdog_up.patch
@@ -0,0 +1,42 @@
+From 224d3a2d6bebe9b52bfcf858694e798a3b00f624 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 9 Jun 2020 22:11:54 +0200
+Subject: net: sched: export __netdev_watchdog_up()
+
+From: Valentin Longchamp <valentin@longchamp.me>
+
+[ Upstream commit 1a3db27ad9a72d033235b9673653962c02e3486e ]
+
+Since the quiesce/activate rework, __netdev_watchdog_up() is directly
+called in the ucc_geth driver.
+
+Unfortunately, this function is not available for modules and thus
+ucc_geth cannot be built as a module anymore. Fix it by exporting
+__netdev_watchdog_up().
+
+Since the commit introducing the regression was backported to stable
+branches, this one should ideally be as well.
+
+Fixes: 79dde73cf9bc ("net/ethernet/freescale: rework quiesce/activate for ucc_geth")
+Signed-off-by: Valentin Longchamp <valentin@longchamp.me>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ net/sched/sch_generic.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
+index 09cd654347487..10c05fa0e6b35 100644
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
+@@ -329,6 +329,7 @@ void __netdev_watchdog_up(struct net_device *dev)
+                       dev_hold(dev);
+       }
+ }
++EXPORT_SYMBOL_GPL(__netdev_watchdog_up);
+ 
+ static void dev_watchdog_up(struct net_device *dev)
+ {
+-- 
+2.25.1
+

diff --git a/queue-4.4/series b/queue-4.4/series
index 1305d21b2ea52f58be203c7272672e9e8e2e5350..28f80f993765c7e3bd759ed66bd23f8aa797e575 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -77,3 +77,5 @@ net-core-device_rename-use-rwsem-instead-of-a-seqcou.patch
 net-revert-pkt_sched-fq-use-proper-locking-in-fq_dump_stats.patch
 scsi-scsi_devinfo-handle-non-terminated-strings.patch
 l2tp-allow-duplicate-session-creation-with-udp.patch
+net-sched-export-__netdev_watchdog_up.patch
+fix-a-braino-in-sparc32-fix-register-window-handling.patch