|
@@ -2965,7 +2965,7 @@ struct workqueue_struct *__alloc_workqueue_key(const char *name,
|
|
|
*/
|
|
|
spin_lock(&workqueue_lock);
|
|
|
|
|
|
- if (workqueue_freezing && wq->flags & WQ_FREEZEABLE)
|
|
|
+ if (workqueue_freezing && wq->flags & WQ_FREEZABLE)
|
|
|
for_each_cwq_cpu(cpu, wq)
|
|
|
get_cwq(cpu, wq)->max_active = 0;
|
|
|
|
|
@@ -3077,7 +3077,7 @@ void workqueue_set_max_active(struct workqueue_struct *wq, int max_active)
|
|
|
|
|
|
spin_lock_irq(&gcwq->lock);
|
|
|
|
|
|
- if (!(wq->flags & WQ_FREEZEABLE) ||
|
|
|
+ if (!(wq->flags & WQ_FREEZABLE) ||
|
|
|
!(gcwq->flags & GCWQ_FREEZING))
|
|
|
get_cwq(gcwq->cpu, wq)->max_active = max_active;
|
|
|
|
|
@@ -3327,7 +3327,7 @@ static int __cpuinit trustee_thread(void *__gcwq)
|
|
|
* want to get it over with ASAP - spam rescuers, wake up as
|
|
|
* many idlers as necessary and create new ones till the
|
|
|
* worklist is empty. Note that if the gcwq is frozen, there
|
|
|
- * may be frozen works in freezeable cwqs. Don't declare
|
|
|
+ * may be frozen works in freezable cwqs. Don't declare
|
|
|
* completion while frozen.
|
|
|
*/
|
|
|
while (gcwq->nr_workers != gcwq->nr_idle ||
|
|
@@ -3585,9 +3585,9 @@ EXPORT_SYMBOL_GPL(work_on_cpu);
|
|
|
/**
|
|
|
* freeze_workqueues_begin - begin freezing workqueues
|
|
|
*
|
|
|
- * Start freezing workqueues. After this function returns, all
|
|
|
- * freezeable workqueues will queue new works to their frozen_works
|
|
|
- * list instead of gcwq->worklist.
|
|
|
+ * Start freezing workqueues. After this function returns, all freezable
|
|
|
+ * workqueues will queue new works to their frozen_works list instead of
|
|
|
+ * gcwq->worklist.
|
|
|
*
|
|
|
* CONTEXT:
|
|
|
* Grabs and releases workqueue_lock and gcwq->lock's.
|
|
@@ -3613,7 +3613,7 @@ void freeze_workqueues_begin(void)
|
|
|
list_for_each_entry(wq, &workqueues, list) {
|
|
|
struct cpu_workqueue_struct *cwq = get_cwq(cpu, wq);
|
|
|
|
|
|
- if (cwq && wq->flags & WQ_FREEZEABLE)
|
|
|
+ if (cwq && wq->flags & WQ_FREEZABLE)
|
|
|
cwq->max_active = 0;
|
|
|
}
|
|
|
|
|
@@ -3624,7 +3624,7 @@ void freeze_workqueues_begin(void)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * freeze_workqueues_busy - are freezeable workqueues still busy?
|
|
|
+ * freeze_workqueues_busy - are freezable workqueues still busy?
|
|
|
*
|
|
|
* Check whether freezing is complete. This function must be called
|
|
|
* between freeze_workqueues_begin() and thaw_workqueues().
|
|
@@ -3633,8 +3633,8 @@ void freeze_workqueues_begin(void)
|
|
|
* Grabs and releases workqueue_lock.
|
|
|
*
|
|
|
* RETURNS:
|
|
|
- * %true if some freezeable workqueues are still busy. %false if
|
|
|
- * freezing is complete.
|
|
|
+ * %true if some freezable workqueues are still busy. %false if freezing
|
|
|
+ * is complete.
|
|
|
*/
|
|
|
bool freeze_workqueues_busy(void)
|
|
|
{
|
|
@@ -3654,7 +3654,7 @@ bool freeze_workqueues_busy(void)
|
|
|
list_for_each_entry(wq, &workqueues, list) {
|
|
|
struct cpu_workqueue_struct *cwq = get_cwq(cpu, wq);
|
|
|
|
|
|
- if (!cwq || !(wq->flags & WQ_FREEZEABLE))
|
|
|
+ if (!cwq || !(wq->flags & WQ_FREEZABLE))
|
|
|
continue;
|
|
|
|
|
|
BUG_ON(cwq->nr_active < 0);
|
|
@@ -3699,7 +3699,7 @@ void thaw_workqueues(void)
|
|
|
list_for_each_entry(wq, &workqueues, list) {
|
|
|
struct cpu_workqueue_struct *cwq = get_cwq(cpu, wq);
|
|
|
|
|
|
- if (!cwq || !(wq->flags & WQ_FREEZEABLE))
|
|
|
+ if (!cwq || !(wq->flags & WQ_FREEZABLE))
|
|
|
continue;
|
|
|
|
|
|
/* restore max_active and repopulate worklist */
|