summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0103-hrtimer-move-state-change-before-hrtimer_cancel-in-d.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0103-hrtimer-move-state-change-before-hrtimer_cancel-in-d.patch')
-rw-r--r--debian/patches-rt/0103-hrtimer-move-state-change-before-hrtimer_cancel-in-d.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches-rt/0103-hrtimer-move-state-change-before-hrtimer_cancel-in-d.patch b/debian/patches-rt/0103-hrtimer-move-state-change-before-hrtimer_cancel-in-d.patch
index 4a6296d99..a136f89e4 100644
--- a/debian/patches-rt/0103-hrtimer-move-state-change-before-hrtimer_cancel-in-d.patch
+++ b/debian/patches-rt/0103-hrtimer-move-state-change-before-hrtimer_cancel-in-d.patch
@@ -1,8 +1,8 @@
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 6 Dec 2018 10:15:13 +0100
-Subject: [PATCH 103/351] hrtimer: move state change before hrtimer_cancel in
+Subject: [PATCH 103/353] hrtimer: move state change before hrtimer_cancel in
do_nanosleep()
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=267d544f94bf3b3faae448fb614cde6ea57d1bb1
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=208c5ed45b86d053d5c2f157a5e7d22ac12a57d8
There is a small window between setting t->task to NULL and waking the
task up (which would set TASK_RUNNING). So the timer would fire, run and
@@ -28,7 +28,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
-index 0833e5cf224d..009001f06d33 100644
+index 0dceea25f9f5..4de39964594d 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1852,12 +1852,12 @@ static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mod