diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-11 16:59:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-11 16:59:49 -0700 |
| commit | 0a5d6c641b671370f019cbe20fe51ee3ef00264c (patch) | |
| tree | e4837d29b156e0bf09c84caf2fbcb3043a63c2b6 /include/linux | |
| parent | Merge tag 'for-5.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux (diff) | |
| parent | workqueue: fix state-dump console deadlock (diff) | |
| download | linux-dev-0a5d6c641b671370f019cbe20fe51ee3ef00264c.tar.xz linux-dev-0a5d6c641b671370f019cbe20fe51ee3ef00264c.zip | |
Merge branch 'for-5.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue fixes from Tejun Heo:
"One patch to add a missing __printf annotation and the other to enable
deferred printing for debug dumps to avoid deadlocks when triggered
from some contexts (e.g. console drivers)"
* 'for-5.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
workqueue: fix state-dump console deadlock
workqueue: annotate alloc_workqueue() as printf
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/workqueue.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index 2ebef6b1a3d6..74d3c1efd9bb 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -399,9 +399,8 @@ extern struct workqueue_struct *system_freezable_power_efficient_wq; * RETURNS: * Pointer to the allocated workqueue on success, %NULL on failure. */ -struct workqueue_struct *alloc_workqueue(const char *fmt, - unsigned int flags, - int max_active, ...); +__printf(1, 4) struct workqueue_struct * +alloc_workqueue(const char *fmt, unsigned int flags, int max_active, ...); /** * alloc_ordered_workqueue - allocate an ordered workqueue |