diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-01-26 04:23:27 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-26 04:23:27 -0500 |
commit | 6b620478e58677bb3f4ec884abb29ef9d68c7821 (patch) | |
tree | 7a438fc5412587f9bd9b907d4d423ea52a498006 /tools/perf/builtin-script.c | |
parent | 906b17dc089f7fa87e37a9cfe6ee185efc90e0da (diff) | |
parent | 6fb1b304255efc5c4c93874ac8c066272e257e28 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework
Diffstat (limited to 'tools/perf/builtin-script.c')
-rw-r--r-- | tools/perf/builtin-script.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 150a606002eb..b766c2a9ac97 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c | |||
@@ -77,8 +77,8 @@ static int process_sample_event(event_t *event, struct sample_data *sample, | |||
77 | if (session->sample_type & PERF_SAMPLE_RAW) { | 77 | if (session->sample_type & PERF_SAMPLE_RAW) { |
78 | if (debug_mode) { | 78 | if (debug_mode) { |
79 | if (sample->time < last_timestamp) { | 79 | if (sample->time < last_timestamp) { |
80 | pr_err("Samples misordered, previous: %llu " | 80 | pr_err("Samples misordered, previous: %" PRIu64 |
81 | "this: %llu\n", last_timestamp, | 81 | " this: %" PRIu64 "\n", last_timestamp, |
82 | sample->time); | 82 | sample->time); |
83 | nr_unordered++; | 83 | nr_unordered++; |
84 | } | 84 | } |
@@ -126,7 +126,7 @@ static int __cmd_script(struct perf_session *session) | |||
126 | ret = perf_session__process_events(session, &event_ops); | 126 | ret = perf_session__process_events(session, &event_ops); |
127 | 127 | ||
128 | if (debug_mode) | 128 | if (debug_mode) |
129 | pr_err("Misordered timestamps: %llu\n", nr_unordered); | 129 | pr_err("Misordered timestamps: %" PRIu64 "\n", nr_unordered); |
130 | 130 | ||
131 | return ret; | 131 | return ret; |
132 | } | 132 | } |