diff --git a/[refs] b/[refs] index 61c987eb5a9f..a31d2790b69c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b1bce1787700768cbc87c8509851c6f49d252dc +refs/heads/master: 20764ff1efb440640353053ec83263e69e1259e0 diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index dde6f0ace6dc..6e9dae7eb418 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -3051,9 +3051,8 @@ __init static int tracer_alloc_buffers(void) } max_tr.entries = global_trace.entries; - pr_info("tracer: %d pages allocated for %ld", - pages, trace_nr_entries); - pr_info(" entries of %ld bytes\n", (long)TRACE_ENTRY_SIZE); + pr_info("tracer: %d pages allocated for %ld entries of %ld bytes\n", + pages, trace_nr_entries, (long)TRACE_ENTRY_SIZE); pr_info(" actual entries %ld\n", global_trace.entries); tracer_init_debugfs();