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

[linux-2.6-block.git] / kernel / workqueue.c

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 914b845ad4ff10e2d89ba34db43ed68d1d2367d2..bc88fd939f4e72c43de15ad96c42aa2fdce4a996 100644 (file)
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -365,11 +365,6 @@ static void show_pwq(struct pool_workqueue *pwq);
                         !lockdep_is_held(&wq_pool_mutex),              \
                         "RCU or wq_pool_mutex should be held")
 
-#define assert_rcu_or_wq_mutex(wq)                                     \
-       RCU_LOCKDEP_WARN(!rcu_read_lock_held() &&                       \
-                        !lockdep_is_held(&wq->mutex),                  \
-                        "RCU or wq->mutex should be held")
-
 #define assert_rcu_or_wq_mutex_or_pool_mutex(wq)                       \
        RCU_LOCKDEP_WARN(!rcu_read_lock_held() &&                       \
                         !lockdep_is_held(&wq->mutex) &&                \
@@ -427,9 +422,7 @@ static void show_pwq(struct pool_workqueue *pwq);
  */
 #define for_each_pwq(pwq, wq)                                          \
        list_for_each_entry_rcu((pwq), &(wq)->pwqs, pwqs_node,          \
-                               lockdep_is_held(&wq->mutex))            \
-               if (({ assert_rcu_or_wq_mutex(wq); false; })) { }       \
-               else
+                                lockdep_is_held(&(wq->mutex)))
 
 #ifdef CONFIG_DEBUG_OBJECTS_WORK