summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0274-Revert-futex-workaround-migrate_disable-enable-in-di.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0274-Revert-futex-workaround-migrate_disable-enable-in-di.patch')
-rw-r--r--debian/patches-rt/0274-Revert-futex-workaround-migrate_disable-enable-in-di.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches-rt/0274-Revert-futex-workaround-migrate_disable-enable-in-di.patch b/debian/patches-rt/0274-Revert-futex-workaround-migrate_disable-enable-in-di.patch
index efd697df7..18736f90c 100644
--- a/debian/patches-rt/0274-Revert-futex-workaround-migrate_disable-enable-in-di.patch
+++ b/debian/patches-rt/0274-Revert-futex-workaround-migrate_disable-enable-in-di.patch
@@ -1,8 +1,8 @@
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Wed, 26 Jun 2019 17:44:27 +0200
-Subject: [PATCH 274/353] Revert "futex: workaround migrate_disable/enable in
+Subject: [PATCH 274/354] Revert "futex: workaround migrate_disable/enable in
different context"
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=d2dcb7eaaa0efc8bfa45966437cd717ab6318c99
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=94d4be2c5195ea06136c948348e7152fc56bc4a3
[ Upstream commit a71221d81cc4873891ae44f3aa02df596079b786 ]
@@ -16,7 +16,7 @@ Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
1 file changed, 19 deletions(-)
diff --git a/kernel/futex.c b/kernel/futex.c
-index bcd01b5a47df..9bcfdcffb2dd 100644
+index dd0d6a166a83..b0667c419509 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -2998,14 +2998,6 @@ static int futex_lock_pi(u32 __user *uaddr, unsigned int flags,