Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent

This commit is contained in:
Ingo Molnar 2011-01-03 19:59:24 +01:00
commit a0a2b71bb7

View File

@ -356,7 +356,7 @@ static size_t ipchain__fprintf_graph_line(FILE *fp, int depth, int depth_mask,
static size_t ipchain__fprintf_graph(FILE *fp, struct callchain_list *chain,
int depth, int depth_mask, int period,
u64 total_samples, int hits,
u64 total_samples, u64 hits,
int left_margin)
{
int i;