diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-03 12:27:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-03 12:27:36 -0700 |
| commit | 0adb8bc0391f1fa7820529c0200fb0c4912fe365 (patch) | |
| tree | d5901122c87e63f70b3c4674ee977b2376a058ee /include/linux/workqueue.h | |
| parent | d8836005236425cf3cfcc8967abd1d5c21f607f8 (diff) | |
| parent | 00d5d15b0641f4ae463253eba06c836d56c2ce42 (diff) | |
Merge branch 'for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue updates from Tejun Heo:
"Nothing too interesting. Just two trivial patches"
* 'for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
workqueue: Mark up unlocked access to wq->first_flusher
workqueue: Make workqueue_init*() return void
Diffstat (limited to 'include/linux/workqueue.h')
| -rw-r--r-- | include/linux/workqueue.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index e48554e6526c..8b505d22fc0e 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -665,7 +665,7 @@ int workqueue_online_cpu(unsigned int cpu); int workqueue_offline_cpu(unsigned int cpu); #endif -int __init workqueue_init_early(void); -int __init workqueue_init(void); +void __init workqueue_init_early(void); +void __init workqueue_init(void); #endif |