Pull workqueue update from Tejun Heo: "Just one patch to add destroy_work_on_stack() annotations to help debugobj debugging" * 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: Calling destroy_work_on_stack() to pair with INIT_WORK_ONSTACK()
Showing the changes to kernel/workqueue.c (1 of 1 file). Show all
Unified · Split
| @@ -4789,6 +4789,7 @@ static int workqueue_cpu_down_callback(struct notifier_block *nfb, · 4788 unmodified lines | |||
| 4789 | 4789 | ||
| 4790 | /* wait for per-cpu unbinding to finish */ | 4790 | /* wait for per-cpu unbinding to finish */ |
| 4791 | flush_work(&unbind_work); | 4791 | flush_work(&unbind_work); |
| 4792 | destroy_work_on_stack(&unbind_work); | ||
| 4792 | break; | 4793 | break; |
| 4793 | } | 4794 | } |
| 4794 | return NOTIFY_OK; | 4795 | return NOTIFY_OK; |
| @@ -4828,6 +4829,7 @@ long work_on_cpu(int cpu, long (*fn)(void *), void *arg) · 33 unmodified lines | |||
| 4828 | INIT_WORK_ONSTACK(&wfc.work, work_for_cpu_fn); | 4829 | INIT_WORK_ONSTACK(&wfc.work, work_for_cpu_fn); |
| 4829 | schedule_work_on(cpu, &wfc.work); | 4830 | schedule_work_on(cpu, &wfc.work); |
| 4830 | flush_work(&wfc.work); | 4831 | flush_work(&wfc.work); |
| 4832 | destroy_work_on_stack(&wfc.work); | ||
| 4831 | return wfc.ret; | 4833 | return wfc.ret; |
| 4832 | } | 4834 | } |
| 4833 | EXPORT_SYMBOL_GPL(work_on_cpu); | 4835 | EXPORT_SYMBOL_GPL(work_on_cpu); |