Merging debian version 4.19.260-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 37 insertions, 0 deletions

diff --git a/debian/patches-rt/0316-sched-migrate_enable-Remove-__schedule-call.patch b/debian/patches-rt/0316-sched-migrate_enable-Remove-__schedule-call.patch
new file mode 100644
index 000000000..a47b24169
--- /dev/null
+++ b/debian/patches-rt/0316-sched-migrate_enable-Remove-__schedule-call.patch
@@ -0,0 +1,37 @@
+From: Scott Wood <swood@redhat.com>
+Date: Fri, 24 Jan 2020 06:11:47 -0500
+Subject: [PATCH 316/342] sched: migrate_enable: Remove __schedule() call
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=f416311d786e940c55fab1dfcdbdd03188b6855f
+
+[ Upstream commit b8162e61e9a33bd1de6452eb838fbf50a93ddd9a ]
+
+We can rely on preempt_enable() to schedule.  Besides simplifying the
+code, this potentially allows sequences such as the following to be
+permitted:
+
+migrate_disable();
+preempt_disable();
+migrate_enable();
+preempt_enable();
+
+Suggested-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Signed-off-by: Scott Wood <swood@redhat.com>
+Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+---
+ kernel/sched/core.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/kernel/sched/core.c b/kernel/sched/core.c
+index 8b946353b1d7..410882ff2007 100644
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -7345,7 +7345,6 @@ void migrate_enable(void)
+ 		stop_one_cpu_nowait(task_cpu(p), migration_cpu_stop,
+ 				    arg, work);
+ 		tlb_migrate_finish(p->mm);
+-		__schedule(true);
+ 	}
+ 
+ out: