diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-17 14:02:43 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-17 14:02:43 +1000 |
| commit | e0e662a6607510bdb9376ca7b695266dee274200 (patch) | |
| tree | 27b713b094b00f68662bb2dce7371422e0c71db2 | |
| parent | f68f2db75d852b10850e5d1cfd3cbab05ce290e6 (diff) | |
| parent | 77f300b198f93328c26191b52655ce1b62e202cf (diff) | |
Merge remote-tracking branch 'workqueues/for-next'
| -rw-r--r-- | kernel/workqueue.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 0ee63af30bd1..3150b217c936 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -4100,7 +4100,8 @@ static void wq_update_unbound_numa(struct workqueue_struct *wq, int cpu, if (!pwq) { pr_warning("workqueue: allocation failed while updating NUMA affinity of \"%s\"\n", wq->name); - goto out_unlock; + mutex_lock(&wq->mutex); + goto use_dfl_pwq; } /* |