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/util/parse-events.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/util/parse-events.c')
| -rw-r--r-- | tools/perf/util/parse-events.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index bc2732ee23eb..135f69baf966 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c | |||
| @@ -279,7 +279,7 @@ const char *__event_name(int type, u64 config) | |||
| 279 | static char buf[32]; | 279 | static char buf[32]; |
| 280 | 280 | ||
| 281 | if (type == PERF_TYPE_RAW) { | 281 | if (type == PERF_TYPE_RAW) { |
| 282 | sprintf(buf, "raw 0x%llx", config); | 282 | sprintf(buf, "raw 0x%" PRIx64, config); |
| 283 | return buf; | 283 | return buf; |
| 284 | } | 284 | } |
| 285 | 285 | ||