diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-24 17:09:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-24 17:09:35 -0500 |
| commit | 5bdc22a56549e7983c6b443298672641952ea035 (patch) | |
| tree | fbfd4e7453e4fd23dfef826d4610ed2aae47b36c /tools/perf/builtin-stat.c | |
| parent | b6f4098897f30b7ea90a1c1edf35e9b20a9d828a (diff) | |
| parent | e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/sched/sch_hfsc.c
net/sched/sch_htb.c
net/sched/sch_tbf.c
Diffstat (limited to 'tools/perf/builtin-stat.c')
| -rw-r--r-- | tools/perf/builtin-stat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 0ff11d9b13be..a482a191a0ca 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c | |||
| @@ -206,8 +206,8 @@ static int read_counter_aggr(struct perf_evsel *counter) | |||
| 206 | update_stats(&ps->res_stats[i], count[i]); | 206 | update_stats(&ps->res_stats[i], count[i]); |
| 207 | 207 | ||
| 208 | if (verbose) { | 208 | if (verbose) { |
| 209 | fprintf(stderr, "%s: %Ld %Ld %Ld\n", event_name(counter), | 209 | fprintf(stderr, "%s: %" PRIu64 " %" PRIu64 " %" PRIu64 "\n", |
| 210 | count[0], count[1], count[2]); | 210 | event_name(counter), count[0], count[1], count[2]); |
| 211 | } | 211 | } |
| 212 | 212 | ||
| 213 | /* | 213 | /* |