kernel/workqueue.c | 6 ------ 1 file changed, 6 deletions(-)
From: zhang jiao <zhangjiao2@cmss.chinamobile.com>
assert_rcu_or_wq_mutex_or_pool_mutex is never referenced in the code.
Just remove it.
Signed-off-by: zhang jiao <zhangjiao2@cmss.chinamobile.com>
---
kernel/workqueue.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index c6b79b3675c3..a86889d8218b 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -539,12 +539,6 @@ static void show_one_worker_pool(struct worker_pool *pool);
!lockdep_is_held(&wq_pool_mutex), \
"RCU or wq_pool_mutex should be held")
-#define assert_rcu_or_wq_mutex_or_pool_mutex(wq) \
- RCU_LOCKDEP_WARN(!rcu_read_lock_any_held() && \
- !lockdep_is_held(&wq->mutex) && \
- !lockdep_is_held(&wq_pool_mutex), \
- "RCU, wq->mutex or wq_pool_mutex should be held")
-
#define for_each_bh_worker_pool(pool, cpu) \
for ((pool) = &per_cpu(bh_worker_pools, cpu)[0]; \
(pool) < &per_cpu(bh_worker_pools, cpu)[NR_STD_WORKER_POOLS]; \
--
2.33.0
Applied to wq/for-6.19. Thanks. -- tejun
Hello, On Mon, Nov 10, 2025 at 9:26 AM zhangjiao2 <zhangjiao2@cmss.chinamobile.com> wrote: > > From: zhang jiao <zhangjiao2@cmss.chinamobile.com> > > assert_rcu_or_wq_mutex_or_pool_mutex is never referenced in the code. > Just remove it. > > Signed-off-by: zhang jiao <zhangjiao2@cmss.chinamobile.com> > --- > kernel/workqueue.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/kernel/workqueue.c b/kernel/workqueue.c > index c6b79b3675c3..a86889d8218b 100644 > --- a/kernel/workqueue.c > +++ b/kernel/workqueue.c > @@ -539,12 +539,6 @@ static void show_one_worker_pool(struct worker_pool *pool); > !lockdep_is_held(&wq_pool_mutex), \ > "RCU or wq_pool_mutex should be held") > > -#define assert_rcu_or_wq_mutex_or_pool_mutex(wq) \ > - RCU_LOCKDEP_WARN(!rcu_read_lock_any_held() && \ > - !lockdep_is_held(&wq->mutex) && \ > - !lockdep_is_held(&wq_pool_mutex), \ > - "RCU, wq->mutex or wq_pool_mutex should be held") > - Reviewed-by: Lai Jiangshan <jiangshanlai@gmail.com> Thanks Lai
© 2016 - 2025 Red Hat, Inc.