diff options
Diffstat (limited to 'debian/patches-rt/workqueue-Convert-for_each_wq-to-use-built-in-list-c.patch')
| -rw-r--r-- | debian/patches-rt/workqueue-Convert-for_each_wq-to-use-built-in-list-c.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/debian/patches-rt/workqueue-Convert-for_each_wq-to-use-built-in-list-c.patch b/debian/patches-rt/workqueue-Convert-for_each_wq-to-use-built-in-list-c.patch deleted file mode 100644 index 09082737f..000000000 --- a/debian/patches-rt/workqueue-Convert-for_each_wq-to-use-built-in-list-c.patch +++ /dev/null @@ -1,46 +0,0 @@ -From: "Joel Fernandes (Google)" <joel@joelfernandes.org> -Date: Thu, 15 Aug 2019 10:18:42 -0400 -Subject: [PATCH] workqueue: Convert for_each_wq to use built-in list check -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patches-5.4.13-rt7.tar.xz - -Because list_for_each_entry_rcu() can now check for holding a -lock as well as for being in an RCU read-side critical section, -this commit replaces the workqueue_sysfs_unregister() function's -use of assert_rcu_or_wq_mutex() and list_for_each_entry_rcu() with -list_for_each_entry_rcu() augmented with a lockdep_is_held() optional -argument. - -Acked-by: Tejun Heo <tj@kernel.org> -Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org> -Signed-off-by: Paul E. McKenney <paulmck@kernel.org> -Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> ---- - kernel/workqueue.c | 10 ++-------- - 1 file changed, 2 insertions(+), 8 deletions(-) - ---- a/kernel/workqueue.c -+++ b/kernel/workqueue.c -@@ -364,11 +364,6 @@ static void workqueue_sysfs_unregister(s - !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) && \ -@@ -425,9 +420,8 @@ static void workqueue_sysfs_unregister(s - * ignored. - */ - #define for_each_pwq(pwq, wq) \ -- list_for_each_entry_rcu((pwq), &(wq)->pwqs, pwqs_node) \ -- if (({ assert_rcu_or_wq_mutex(wq); false; })) { } \ -- else -+ list_for_each_entry_rcu((pwq), &(wq)->pwqs, pwqs_node, \ -+ lockdep_is_held(&(wq->mutex))) - - #ifdef CONFIG_DEBUG_OBJECTS_WORK - |