diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2020-02-03 12:59:17 +0100 |
|---|---|---|
| committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2020-02-03 12:59:17 +0100 |
| commit | 0d9814c65b67abf558330ed09846d06b797d1840 (patch) | |
| tree | 5de358296b85611917e36a82fc261d1c7a1a10d0 | |
| parent | 17e1f681bcd0a15ae81acc473d39726f4c42c6ca (diff) | |
| download | linux-rt-5.4.17-rt8-patches.tar.gz | |
[ANNOUNCE] v5.4.17-rt8v5.4.17-rt8-patches
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
| -rw-r--r-- | patches/localversion.patch | 2 | ||||
| -rw-r--r-- | patches/series | 2 | ||||
| -rw-r--r-- | patches/workqueue-Convert-for_each_wq-to-use-built-in-list-c.patch | 45 |
3 files changed, 1 insertions, 48 deletions
diff --git a/patches/localversion.patch b/patches/localversion.patch index bbb08330835d..68c7b973cc48 100644 --- a/patches/localversion.patch +++ b/patches/localversion.patch @@ -10,4 +10,4 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- /dev/null +++ b/localversion-rt @@ -0,0 +1 @@ -+-rt7 ++-rt8 diff --git a/patches/series b/patches/series index e0641ef2503f..d780e6715a12 100644 --- a/patches/series +++ b/patches/series @@ -19,8 +19,6 @@ lib-smp_processor_id-Don-t-use-cpumask_equal.patch 0006-jbd2-Make-state-lock-a-spinlock.patch 0007-jbd2-Free-journal-head-outside-of-locked-region.patch -# 5a6446626d7e062b47a5cc1cf27d5060e60bb0d9 -workqueue-Convert-for_each_wq-to-use-built-in-list-c.patch # 2579a4eefc04d1c23eef8f3f0db3309f955e5792 x86-ioapic-Rename-misnamed-functions.patch # 9e8d42a0f7eb9056f8bdb241b91738b5a2923f4c diff --git a/patches/workqueue-Convert-for_each_wq-to-use-built-in-list-c.patch b/patches/workqueue-Convert-for_each_wq-to-use-built-in-list-c.patch deleted file mode 100644 index 07342c6a9087..000000000000 --- a/patches/workqueue-Convert-for_each_wq-to-use-built-in-list-c.patch +++ /dev/null @@ -1,45 +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 - -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 - |