summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/hrtimer-consolidate-hrtimer_init-hrtimer_init_sleepe.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/hrtimer-consolidate-hrtimer_init-hrtimer_init_sleepe.patch')
-rw-r--r--debian/patches-rt/hrtimer-consolidate-hrtimer_init-hrtimer_init_sleepe.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches-rt/hrtimer-consolidate-hrtimer_init-hrtimer_init_sleepe.patch b/debian/patches-rt/hrtimer-consolidate-hrtimer_init-hrtimer_init_sleepe.patch
index 1bfe18913..7382ce824 100644
--- a/debian/patches-rt/hrtimer-consolidate-hrtimer_init-hrtimer_init_sleepe.patch
+++ b/debian/patches-rt/hrtimer-consolidate-hrtimer_init-hrtimer_init_sleepe.patch
@@ -1,7 +1,7 @@
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Tue, 3 Jul 2018 11:25:41 +0200
Subject: [PATCH v2] hrtimer: consolidate hrtimer_init() + hrtimer_init_sleeper() calls
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.10-rt8.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.13-rt10.tar.xz
hrtimer_init_sleeper() calls require a prior initialisation of the
hrtimer object with hrtimer_init(). Lets make the initialisation of
@@ -117,7 +117,7 @@ Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
current->timer_slack_ns, \
--- a/kernel/futex.c
+++ b/kernel/futex.c
-@@ -2624,10 +2624,9 @@ static int futex_wait(u32 __user *uaddr,
+@@ -2681,10 +2681,9 @@ static int futex_wait(u32 __user *uaddr,
if (abs_time) {
to = &timeout;
@@ -131,7 +131,7 @@ Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
hrtimer_set_expires_range_ns(&to->timer, *abs_time,
current->timer_slack_ns);
}
-@@ -2726,9 +2725,8 @@ static int futex_lock_pi(u32 __user *uad
+@@ -2783,9 +2782,8 @@ static int futex_lock_pi(u32 __user *uad
if (time) {
to = &timeout;
@@ -143,7 +143,7 @@ Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
hrtimer_set_expires(&to->timer, *time);
}
-@@ -3144,10 +3142,9 @@ static int futex_wait_requeue_pi(u32 __u
+@@ -3201,10 +3199,9 @@ static int futex_wait_requeue_pi(u32 __u
if (abs_time) {
to = &timeout;