Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu

Pull RCU updates from Paul E. McKenney:

 - Removal of spin_unlock_wait()
 - SRCU updates
 - Torture-test updates
 - Documentation updates
 - Miscellaneous fixes
 - CPU-hotplug fixes
 - Miscellaneous non-RCU fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 4 insertions, 7 deletions

diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
index 13fc5ae9bf2f..c9524d2d9316 100644
--- a/kernel/sched/completion.c
+++ b/kernel/sched/completion.c
@@ -300,6 +300,8 @@ EXPORT_SYMBOL(try_wait_for_completion);
  */
 bool completion_done(struct completion *x)
 {
+        unsigned long flags;
+
         if (!READ_ONCE(x->done))
                 return false;
 
@@ -307,14 +309,9 @@ bool completion_done(struct completion *x)
          * If ->done, we need to wait for complete() to release ->wait.lock
          * otherwise we can end up freeing the completion before complete()
          * is done referencing it.
-         *
-         * The RMB pairs with complete()'s RELEASE of ->wait.lock and orders
-         * the loads of ->done and ->wait.lock such that we cannot observe
-         * the lock before complete() acquires it while observing the ->done
-         * after it's acquired the lock.
          */
-        smp_rmb();
-        spin_unlock_wait(&x->wait.lock);
+        spin_lock_irqsave(&x->wait.lock, flags);
+        spin_unlock_irqrestore(&x->wait.lock, flags);
         return true;
 }
 EXPORT_SYMBOL(completion_done);