kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tracing: Fix function-graph build warning on 32-bit

Browse source 
Fix

kernel/trace/trace_functions_graph.c: In function ‘trace_print_graph_duration’:
kernel/trace/trace_functions_graph.c:652: warning: comparison of distinct pointer types lacks a cast

when building 36-rc6 on a 32-bit due to the strict type check failing
in the min() macro.

Signed-off-by: Borislav Petkov <bp@alien8.de>
Cc: Chase Douglas <chase.douglas@canonical.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@elte.hu>
LKML-Reference: <20100929080823.GA13595@liondog.tnic>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
This commit is contained in:
Borislav Petkov 2010-09-29 10:08:23 +02:00 committed by Frederic Weisbecker
parent 7cd2541cf2
commit 14cae9bd2f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
kernel/trace/trace_functions_graph.c
View file

@ -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) */ /* Print nsecs (we don't want to exceed 7 numbers) */
if (len < 7) { if (len < 7) {
snprintf(nsecs_str, min(sizeof(nsecs_str), 8UL - len), "%03lu", size_t slen = min_t(size_t, sizeof(nsecs_str), 8UL - len);
nsecs_rem);
snprintf(nsecs_str, slen, "%03lu", nsecs_rem);
ret = trace_seq_printf(s, ".%s", nsecs_str); ret = trace_seq_printf(s, ".%s", nsecs_str);
if (!ret) if (!ret)
return TRACE_TYPE_PARTIAL_LINE; return TRACE_TYPE_PARTIAL_LINE;