diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-02-24 08:41:07 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-02-24 08:41:07 +0100 |
commit | 2ae79026818e7d49fead82b79b1a543e3b9c8a23 (patch) | |
tree | c7ee7bd8b37b0880918d361839fd95988fac2dac /kernel/trace/trace_seq.c | |
parent | 1a99367023f6ac664365a37fa508b059e31d0e88 (diff) | |
parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) |
Merge tag 'v4.0-rc1' into locking/core, to refresh the tree before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/trace_seq.c')
-rw-r--r-- | kernel/trace/trace_seq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c index f8b45d8792f9..e694c9f9efa4 100644 --- a/kernel/trace/trace_seq.c +++ b/kernel/trace/trace_seq.c @@ -120,7 +120,7 @@ void trace_seq_bitmask(struct trace_seq *s, const unsigned long *maskp, __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; |