aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-01-03 19:59:24 +0100
committerIngo Molnar <mingo@elte.hu>2011-01-03 19:59:24 +0100
commita0a2b71bb750ffe9b3faa317cb6317f4ad109383 (patch)
treebda5b05eab82db67e4416682cee808ca422d980c
parentarch/x86/oprofile/op_model_amd.c: Perform initialisation on a single CPU (diff)
parentperf: Fix callchain hit bad cast on ascii display (diff)
downloadlinux-dev-a0a2b71bb750ffe9b3faa317cb6317f4ad109383.tar.xz
linux-dev-a0a2b71bb750ffe9b3faa317cb6317f4ad109383.zip
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent
-rw-r--r--tools/perf/util/hist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 2022e8740994..76bcc35cf9b1 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;