Merge tag 'v4.0-rc2' into irq/core, to refresh the tree before applying new changes

[linux-2.6-block.git] / fs / proc / array.c

diff --git a/fs/proc/array.c b/fs/proc/array.c
index a3ccf4c4ce70b7e79858edc46aff3633458a5655..1295a00ca316c77e0fa8647eb7a97d0406c78f6c 100644 (file)
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -316,12 +316,10 @@ static inline void task_context_switch_counts(struct seq_file *m,
 
 static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
 {
-       seq_puts(m, "Cpus_allowed:\t");
-       seq_cpumask(m, &task->cpus_allowed);
-       seq_putc(m, '\n');
-       seq_puts(m, "Cpus_allowed_list:\t");
-       seq_cpumask_list(m, &task->cpus_allowed);
-       seq_putc(m, '\n');
+       seq_printf(m, "Cpus_allowed:\t%*pb\n",
+                  cpumask_pr_args(&task->cpus_allowed));
+       seq_printf(m, "Cpus_allowed_list:\t%*pbl\n",
+                  cpumask_pr_args(&task->cpus_allowed));
 }
 
 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,