Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kern…

…el/git/frederic/random-tracing into perf/urgent
mariux64 · Jan 3, 2011 · a0a2b71 · a0a2b71
2 parents c7c2580 + d425de5
commit a0a2b71
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
@@ -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;