diff options
| author | David S. Miller <davem@davemloft.net> | 2015-02-17 18:48:51 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-17 18:48:51 -0800 |
| commit | fece13ca005a5f559147e9424321f4b5e01272b4 (patch) | |
| tree | 54e762e70afb664d14152e6bcf89a48be3fb9c13 /kernel/workqueue.c | |
| parent | 855e7e7174bade3f2b63077a81eea5aab525dbf6 (diff) | |
| parent | f5af19d10d151c5a2afae3306578f485c244db25 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index beeeac9e0e3e..f28849394791 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -3083,10 +3083,9 @@ static ssize_t wq_cpumask_show(struct device *dev, int written; mutex_lock(&wq->mutex); - written = cpumask_scnprintf(buf, PAGE_SIZE, wq->unbound_attrs->cpumask); + written = scnprintf(buf, PAGE_SIZE, "%*pb\n", + cpumask_pr_args(wq->unbound_attrs->cpumask)); mutex_unlock(&wq->mutex); - - written += scnprintf(buf + written, PAGE_SIZE - written, "\n"); return written; } |