summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0060-futex-workaround-migrate_disable-enable-in-different.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0060-futex-workaround-migrate_disable-enable-in-different.patch')
-rw-r--r--debian/patches-rt/0060-futex-workaround-migrate_disable-enable-in-different.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches-rt/0060-futex-workaround-migrate_disable-enable-in-different.patch b/debian/patches-rt/0060-futex-workaround-migrate_disable-enable-in-different.patch
index 23da29124..7d3bae3ba 100644
--- a/debian/patches-rt/0060-futex-workaround-migrate_disable-enable-in-different.patch
+++ b/debian/patches-rt/0060-futex-workaround-migrate_disable-enable-in-different.patch
@@ -1,8 +1,8 @@
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 8 Mar 2017 14:23:35 +0100
-Subject: [PATCH 060/353] futex: workaround migrate_disable/enable in different
+Subject: [PATCH 060/354] futex: workaround migrate_disable/enable in different
context
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=005385bd16d108692e1c126bc21baaf65247d41b
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=0e1d4d1ef2aa4b23f0517ca379acd8d54408652a
migrate_disable()/migrate_enable() takes a different path in atomic() vs
!atomic() context. These little hacks ensure that we don't underflow / overflow
@@ -16,7 +16,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
1 file changed, 19 insertions(+)
diff --git a/kernel/futex.c b/kernel/futex.c
-index 3c67da9b8408..fac994367189 100644
+index ca2a2a894839..3fdcf5add961 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -2998,6 +2998,14 @@ static int futex_lock_pi(u32 __user *uaddr, unsigned int flags,