summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0287-sched-deadline-Ensure-inactive_timer-runs-in-hardirq.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0287-sched-deadline-Ensure-inactive_timer-runs-in-hardirq.patch')
-rw-r--r--debian/patches-rt/0287-sched-deadline-Ensure-inactive_timer-runs-in-hardirq.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches-rt/0287-sched-deadline-Ensure-inactive_timer-runs-in-hardirq.patch b/debian/patches-rt/0287-sched-deadline-Ensure-inactive_timer-runs-in-hardirq.patch
index b3668b2fe..0b8da97ac 100644
--- a/debian/patches-rt/0287-sched-deadline-Ensure-inactive_timer-runs-in-hardirq.patch
+++ b/debian/patches-rt/0287-sched-deadline-Ensure-inactive_timer-runs-in-hardirq.patch
@@ -1,8 +1,8 @@
From: Juri Lelli <juri.lelli@redhat.com>
Date: Wed, 31 Jul 2019 12:37:15 +0200
-Subject: [PATCH 287/342] sched/deadline: Ensure inactive_timer runs in hardirq
+Subject: [PATCH 287/351] sched/deadline: Ensure inactive_timer runs in hardirq
context
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=428e3bd4726ac6ebbd987f67871d11fcb95f8369
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=5602a664dba672cb7db6fa266ad071e12b18bf71
[ Upstream commit ba94e7aed7405c58251b1380e6e7d73aa8284b41 ]
@@ -23,10 +23,10 @@ Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
-index 1a285367081c..0bc1bad199c1 100644
+index 52acbb31a777..85310fed26f0 100644
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
-@@ -287,7 +287,7 @@ static void task_non_contending(struct task_struct *p)
+@@ -309,7 +309,7 @@ static void task_non_contending(struct task_struct *p)
dl_se->dl_non_contending = 1;
get_task_struct(p);
@@ -35,7 +35,7 @@ index 1a285367081c..0bc1bad199c1 100644
}
static void task_contending(struct sched_dl_entity *dl_se, int flags)
-@@ -1325,7 +1325,7 @@ void init_dl_inactive_task_timer(struct sched_dl_entity *dl_se)
+@@ -1344,7 +1344,7 @@ void init_dl_inactive_task_timer(struct sched_dl_entity *dl_se)
{
struct hrtimer *timer = &dl_se->inactive_timer;