diff options
author | Mark Brown <broonie@linaro.org> | 2013-08-15 12:09:32 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-15 12:09:32 +0100 |
commit | c1a0dd11e183ccd2dbc42ab699a65a335e065936 (patch) | |
tree | 93df00912f65ff3c50ed674bfe8d4fcfbdc61f0f /kernel/workqueue.c | |
parent | f462c0c2ffbaff2345c215fc65874f50c98ad09c (diff) | |
parent | 519be4566e2e60293d55bcfec71490af8e61b9e7 (diff) |
Merge tag 'v3.10.7' into linux-linaro-lsk
This is the 3.10.7 stable release
Diffstat (limited to 'kernel/workqueue.c')
-rw-r--r-- | kernel/workqueue.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index f02c4a4a0c3..2bebf87f143 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -3411,6 +3411,12 @@ static void copy_workqueue_attrs(struct workqueue_attrs *to, { to->nice = from->nice; cpumask_copy(to->cpumask, from->cpumask); + /* + * Unlike hash and equality test, this function doesn't ignore + * ->no_numa as it is used for both pool and wq attrs. Instead, + * get_unbound_pool() explicitly clears ->no_numa after copying. + */ + to->no_numa = from->no_numa; } /* hash value of the content of @attr */ @@ -3578,6 +3584,12 @@ static struct worker_pool *get_unbound_pool(const struct workqueue_attrs *attrs) lockdep_set_subclass(&pool->lock, 1); /* see put_pwq() */ copy_workqueue_attrs(pool->attrs, attrs); + /* + * no_numa isn't a worker_pool attribute, always clear it. See + * 'struct workqueue_attrs' comments for detail. + */ + pool->attrs->no_numa = false; + /* if cpumask is contained inside a NUMA node, we belong to that node */ if (wq_numa_enabled) { for_each_node(node) { |