tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'wq-for-6.0-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

Pull workqueue fix from Tejun Heo:
"Just one patch to improve flush lockdep coverage"

* tag 'wq-for-6.0-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
workqueue: don't skip lockdep work dependency in cancel_work_sync()

Linus Torvalds aae8dda5 3db61221

+2 -4
+2 -4
kernel/workqueue.c
··· 3066 3066 if (WARN_ON(!work->func)) 3067 3067 return false; 3068 3068 3069 - if (!from_cancel) { 3070 - lock_map_acquire(&work->lockdep_map); 3071 - lock_map_release(&work->lockdep_map); 3072 - } 3069 + lock_map_acquire(&work->lockdep_map); 3070 + lock_map_release(&work->lockdep_map); 3073 3071 3074 3072 if (start_flush_work(work, &barr, from_cancel)) { 3075 3073 wait_for_completion(&barr.done);