diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-18 12:36:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-18 12:36:06 -0800 |
| commit | bc3adfc6703edfd2484902b5391092c717076f87 (patch) | |
| tree | 9df3b216990f6b321095bcc6c35444f5e0d8165c /Documentation | |
| parent | 3c18d4de86e4a7f93815c081e50e0543fa27200f (diff) | |
| parent | 3233cdbd9fa347a6d6897a94cc6ed0302ae83c4f (diff) | |
Merge branch 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
* 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
workqueue: make sure MAYDAY_INITIAL_TIMEOUT is at least 2 jiffies long
workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable'
workqueue: wake up a worker when a rescuer is leaving a gcwq
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/workqueue.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/workqueue.txt b/Documentation/workqueue.txt index 996a27d9b8d..01c513fac40 100644 --- a/Documentation/workqueue.txt +++ b/Documentation/workqueue.txt @@ -190,9 +190,9 @@ resources, scheduled and executed. * Long running CPU intensive workloads which can be better managed by the system scheduler. - WQ_FREEZEABLE + WQ_FREEZABLE - A freezeable wq participates in the freeze phase of the system + A freezable wq participates in the freeze phase of the system suspend operations. Work items on the wq are drained and no new work item starts execution until thawed. |