From: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
v4.19.255-rt114-rc1 stable review patch.
If anyone has any objections, please let me know.
-----------
This reverts the PREEMPT_RT related changes to workqueue. It reverts the
usage of local_locks() and cpu_chill().
This is a preparation to pull in the PREEMPT_RT related changes which
were merged upstream.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
[wagi: 827b6f6962da ("workqueue: rework") already reverted
most of the changes, except the missing update in
put_pwq_unlocked.]
Signed-off-by: Daniel Wagner <wagi@xxxxxxxxx>
---
kernel/workqueue.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 4ed22776b2ee..d97c2ad8dc08 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -1496,11 +1496,9 @@ EXPORT_SYMBOL(queue_work_on);
void delayed_work_timer_fn(struct timer_list *t)
{
struct delayed_work *dwork = from_timer(dwork, t, timer);
- unsigned long flags;
- local_irq_save(flags);
+ /* should have been called from irqsafe timer with irq already off */
__queue_work(dwork->cpu, dwork->wq, &dwork->work);
- local_irq_restore(flags);
}
EXPORT_SYMBOL(delayed_work_timer_fn);
--
2.38.0
