From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 3 Jan 2011 18:59:24 +0000 (+0100)
Subject: Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a0a2b71bb750ffe9b3faa317cb6317f4ad109383;hp=c7c25802b39c443b3745cfa973dc49a97a3491f8;p=mv-sheeva.git

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

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 2022e874099..76bcc35cf9b 100644
--- 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;