diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-29 14:06:12 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-29 14:06:12 -0500 |
| commit | e817b01d116eae783cdf14da534eb6d3d28a3efd (patch) | |
| tree | 42eb94b9bbd249ef552b0493792010cc171ed1e5 | |
| parent | 38aff25e3b45cc5b4c5aca59e2e4cde00c6e07e2 (diff) | |
| download | 4.12-rt-patches-e817b01d116eae783cdf14da534eb6d3d28a3efd.tar.gz | |
futex: refresh patch for comment line now context coming from stable
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | patches/futex-workaround-migrate_disable-enable-in-different.patch | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/patches/futex-workaround-migrate_disable-enable-in-different.patch b/patches/futex-workaround-migrate_disable-enable-in-different.patch index ea63415d18976e..939689090f2986 100644 --- a/patches/futex-workaround-migrate_disable-enable-in-different.patch +++ b/patches/futex-workaround-migrate_disable-enable-in-different.patch @@ -1,3 +1,4 @@ +From 562e9207a8ef3f7c67de7312659f26f891af8473 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Wed, 8 Mar 2017 14:23:35 +0100 Subject: [PATCH] futex: workaround migrate_disable/enable in different context @@ -13,9 +14,11 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/futex.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) +diff --git a/kernel/futex.c b/kernel/futex.c +index d4ec1a1404fc..f5b21fd753a9 100644 --- a/kernel/futex.c +++ b/kernel/futex.c -@@ -2671,9 +2671,18 @@ static int futex_lock_pi(u32 __user *uad +@@ -2682,9 +2682,18 @@ static int futex_lock_pi(u32 __user *uaddr, unsigned int flags, * lock handoff sequence. */ raw_spin_lock_irq(&q.pi_state->pi_mutex.wait_lock); @@ -34,7 +37,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> if (ret) { if (ret == 1) -@@ -2817,10 +2826,21 @@ static int futex_unlock_pi(u32 __user *u +@@ -2828,11 +2837,21 @@ static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags) * observed. */ raw_spin_lock_irq(&pi_state->pi_mutex.wait_lock); @@ -48,7 +51,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> + migrate_disable(); spin_unlock(&hb->lock); -+ /* Drops pi_state->pi_mutex.wait_lock */ + /* drops pi_state->pi_mutex.wait_lock */ ret = wake_futex_pi(uaddr, uval, pi_state); + migrate_enable(); @@ -56,3 +59,6 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> put_pi_state(pi_state); /* +-- +2.15.0 + |