dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing/core

Browse Source
This commit is contained in:
Ingo Molnar
2009-02-03 06:25:38 +01:00
parent b3a8c34886 ecf441b593 b1792e3670
commit dc573f9b20
1490 changed files with 27345 additions and 12339 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/trace/kmemtrace.c
+2 -2
View File
@@ -139,12 +139,12 @@ kmemtrace_print_alloc_compress(struct trace_iterator *iter,
return TRACE_TYPE_PARTIAL_LINE;
/* Requested */
ret = trace_seq_printf(s, "%4zd ", entry->bytes_req);
ret = trace_seq_printf(s, "%4zu ", entry->bytes_req);
if (!ret)
return TRACE_TYPE_PARTIAL_LINE;
/* Allocated */
ret = trace_seq_printf(s, "%4zd ", entry->bytes_alloc);
ret = trace_seq_printf(s, "%4zu ", entry->bytes_alloc);
if (!ret)
return TRACE_TYPE_PARTIAL_LINE;