diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-10-30 11:35:33 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-10-30 11:35:33 +0400 |
| commit | 8748dd9b998f06f7cf3a7ffdca27f05bc4835075 (patch) | |
| tree | d480571278f5952b3f22e43ebb6c75cd0416db5a /tools/perf/util/event.h | |
| parent | 9db55064940db1447976945d07402a923e818962 (diff) | |
| parent | 0da2e9c24804d787cbc919b3e0d28ee7c00240ff (diff) | |
| download | linux-8748dd9b998f06f7cf3a7ffdca27f05bc4835075.tar.xz | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements, fixes and code move from Arnaldo Carvalho de Melo:
* Initialize 'page_size' variable in the python binding, this was sent
for perf/urgent by mistake, then when merging Ingo removed it, fixing
the problem for perf/urgent, but when perf/urgent was merged with
perf/core, where that initialization is needed, made the python
binding mmap call to fail, fix it by initializing page_size again.
* Add a browser for 'perf script' and make it available from the report
and annotate browsers. It does filtering to find the scripts that
handle events found in the perf.data file used. From Feng Tang
* Move some functions from symbol.c to more appropriate files, creating
dso.[ch] in the process, no code changes. From Jiri Olsa
* Fix mmap error output message for when perf_mmap fails and returns
!-EPERM, where the default for mmap_pages, INT_MAX, was causing a
!power of 2 error message, fix from Jiri Olsa.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/event.h')
| -rw-r--r-- | tools/perf/util/event.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h index da97aff5bd75..0d573ff4771a 100644 --- a/tools/perf/util/event.h +++ b/tools/perf/util/event.h @@ -6,6 +6,7 @@ #include "../perf.h" #include "map.h" +#include "build-id.h" /* * PERF_SAMPLE_IP | PERF_SAMPLE_TID | * @@ -96,8 +97,6 @@ struct perf_sample { struct stack_dump user_stack; }; -#define BUILD_ID_SIZE 20 - struct build_id_event { struct perf_event_header header; pid_t pid; |