The patch titled
Subject: tracing: use %*pb[l] to print bitmaps including cpumasks and nodemasks
has been removed from the -mm tree. Its filename was
tracing-use-%pb-to-print-bitmaps-including-cpumasks-and-nodemasks.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Tejun Heo <tj@xxxxxxxxxx>
Subject: tracing: use %*pb[l] to print bitmaps including cpumasks and nodemasks
printk and friends can now formap bitmaps using '%*pb[l]'. cpumask
and nodemask also provide cpumask_pr_args() and nodemask_pr_args()
respectively which can be used to generate the two printf arguments
necessary to format the specified cpu/nodemask.
This patch is dependent on the following two patches.
lib/vsprintf: implement bitmap printing through '%*pb[l]'
cpumask, nodemask: implement cpumask/nodemask_pr_args()
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/trace/trace.c | 6 +++---
kernel/trace/trace_seq.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff -puN kernel/trace/trace.c~tracing-use-%pb-to-print-bitmaps-including-cpumasks-and-nodemasks kernel/trace/trace.c
--- a/kernel/trace/trace.c~tracing-use-%pb-to-print-bitmaps-including-cpumasks-and-nodemasks
+++ a/kernel/trace/trace.c
@@ -3353,12 +3353,12 @@ tracing_cpumask_read(struct file *filp,
mutex_lock(&tracing_cpumask_update_lock);
- len = cpumask_scnprintf(mask_str, count, tr->tracing_cpumask);
- if (count - len < 2) {
+ len = snprintf(mask_str, count, "%*pb\n",
+ cpumask_pr_args(tr->tracing_cpumask));
+ if (len >= count) {
count = -EINVAL;
goto out_err;
}
- len += sprintf(mask_str + len, "\n");
count = simple_read_from_buffer(ubuf, count, ppos, mask_str, NR_CPUS+1);
out_err:
diff -puN kernel/trace/trace_seq.c~tracing-use-%pb-to-print-bitmaps-including-cpumasks-and-nodemasks kernel/trace/trace_seq.c
--- a/kernel/trace/trace_seq.c~tracing-use-%pb-to-print-bitmaps-including-cpumasks-and-nodemasks
+++ a/kernel/trace/trace_seq.c
@@ -120,7 +120,7 @@ void trace_seq_bitmask(struct trace_seq
__trace_seq_init(s);
- seq_buf_bitmask(&s->seq, maskp, nmaskbits);
+ seq_buf_printf(&s->seq, "%*pb", nmaskbits, maskp);
if (unlikely(seq_buf_has_overflowed(&s->seq))) {
s->seq.len = save_len;
_
Patches currently in -mm which might be from tj@xxxxxxxxxx are
origin.patch
block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
fs-mpagec-forgotten-write_sync-in-case-of-data-integrity-write.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
