Skip to content

Commit d81fa66

Browse files
committed
Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue fixlet from Tejun Heo: "Minor documentation update" * 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: Documentation: core-api: minor workqueue.rst cleanups
2 parents 847d9fb + 47684e1 commit d81fa66

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Documentation/core-api/workqueue.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ up.
3939
Although MT wq wasted a lot of resource, the level of concurrency
4040
provided was unsatisfactory. The limitation was common to both ST and
4141
MT wq albeit less severe on MT. Each wq maintained its own separate
42-
worker pool. A MT wq could provide only one execution context per CPU
43-
while a ST wq one for the whole system. Work items had to compete for
42+
worker pool. An MT wq could provide only one execution context per CPU
43+
while an ST wq one for the whole system. Work items had to compete for
4444
those very limited execution contexts leading to various problems
4545
including proneness to deadlocks around the single execution context.
4646

@@ -151,7 +151,7 @@ Application Programming Interface (API)
151151

152152
``alloc_workqueue()`` allocates a wq. The original
153153
``create_*workqueue()`` functions are deprecated and scheduled for
154-
removal. ``alloc_workqueue()`` takes three arguments - @``name``,
154+
removal. ``alloc_workqueue()`` takes three arguments - ``@name``,
155155
``@flags`` and ``@max_active``. ``@name`` is the name of the wq and
156156
also used as the name of the rescuer thread if there is one.
157157

@@ -197,7 +197,7 @@ resources, scheduled and executed.
197197
served by worker threads with elevated nice level.
198198

199199
Note that normal and highpri worker-pools don't interact with
200-
each other. Each maintain its separate pool of workers and
200+
each other. Each maintains its separate pool of workers and
201201
implements concurrency management among its workers.
202202

203203
``WQ_CPU_INTENSIVE``
@@ -249,8 +249,8 @@ unbound worker-pools and only one work item could be active at any given
249249
time thus achieving the same ordering property as ST wq.
250250

251251
In the current implementation the above configuration only guarantees
252-
ST behavior within a given NUMA node. Instead alloc_ordered_queue should
253-
be used to achieve system wide ST behavior.
252+
ST behavior within a given NUMA node. Instead ``alloc_ordered_queue()`` should
253+
be used to achieve system-wide ST behavior.
254254

255255

256256
Example Execution Scenarios

0 commit comments

Comments
 (0)