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-lock.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-lock.c')
| -rw-r--r-- | tools/perf/builtin-lock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index b9c6e5432971..2b36defc5d73 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c | |||
| @@ -782,9 +782,9 @@ static void print_result(void) | |||
| 782 | pr_info("%10u ", st->nr_acquired); | 782 | pr_info("%10u ", st->nr_acquired); |
| 783 | pr_info("%10u ", st->nr_contended); | 783 | pr_info("%10u ", st->nr_contended); |
| 784 | 784 | ||
| 785 | pr_info("%15llu ", st->wait_time_total); | 785 | pr_info("%15" PRIu64 " ", st->wait_time_total); |
| 786 | pr_info("%15llu ", st->wait_time_max); | 786 | pr_info("%15" PRIu64 " ", st->wait_time_max); |
| 787 | pr_info("%15llu ", st->wait_time_min == ULLONG_MAX ? | 787 | pr_info("%15" PRIu64 " ", st->wait_time_min == ULLONG_MAX ? |
| 788 | 0 : st->wait_time_min); | 788 | 0 : st->wait_time_min); |
| 789 | pr_info("\n"); | 789 | pr_info("\n"); |
| 790 | } | 790 | } |