Merge tag 'v4.9.267' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y

This is the 4.9.267 stable release

Change-Id: Iee6d9a8c35574205717f88cfc7f9c89260f53f39
This commit is contained in:
Mauro (mdrjr) Ribeiro
2021-07-30 20:48:39 -03:00
45 changed files with 245 additions and 188 deletions

View File

@@ -1377,7 +1377,6 @@ static void __queue_work(int cpu, struct workqueue_struct *wq,
*/
WARN_ON_ONCE(!irqs_disabled());
debug_work_activate(work);
/* if draining, only works from the same workqueue are allowed */
if (unlikely(wq->flags & __WQ_DRAINING) &&
@@ -1460,6 +1459,7 @@ retry:
worklist = &pwq->delayed_works;
}
debug_work_activate(work);
insert_work(pwq, work, worklist, work_flags);
spin_unlock(&pwq->pool->lock);