From: Sebastian Andrzej Siewior Date: Fri, 21 Oct 2022 16:15:56 +0200 Subject: [PATCH 343/354] Revert "workqueue: Use local irq lock instead of irq disable regions" Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=2fe895f00f08cac8f1bbbdc146b489b821d5347f 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 [wagi: 827b6f6962da ("workqueue: rework") already reverted most of the changes, except the missing update in put_pwq_unlocked.] Signed-off-by: Daniel Wagner --- kernel/workqueue.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 8e012510425e..0f2450425879 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1499,11 +1499,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);