diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-15 05:12:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-15 05:12:45 +0200 |
| commit | d9d572a9c0195486e3baf0d8d6a710196a707335 (patch) | |
| tree | af6ccb502b280adf5a4cd4c7be9243593432da26 /kernel/trace | |
| parent | 3cba11d32bb4b24c3ba257043595772df4b9c7b5 (diff) | |
| parent | ebc8827f75954fe315492883eee5cb3f355d547d (diff) | |
| download | kernel_samsung_smdk4412-d9d572a9c0195486e3baf0d8d6a710196a707335.zip kernel_samsung_smdk4412-d9d572a9c0195486e3baf0d8d6a710196a707335.tar.gz kernel_samsung_smdk4412-d9d572a9c0195486e3baf0d8d6a710196a707335.tar.bz2 | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace_functions_graph.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c index 02c708a..ef49e93 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c @@ -665,8 +665,9 @@ trace_print_graph_duration(unsigned long long duration, struct trace_seq *s) /* Print nsecs (we don't want to exceed 7 numbers) */ if (len < 7) { - snprintf(nsecs_str, min(sizeof(nsecs_str), 8UL - len), "%03lu", - nsecs_rem); + size_t slen = min_t(size_t, sizeof(nsecs_str), 8UL - len); + + snprintf(nsecs_str, slen, "%03lu", nsecs_rem); ret = trace_seq_printf(s, ".%s", nsecs_str); if (!ret) return TRACE_TYPE_PARTIAL_LINE; |