diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-09-13 17:11:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-09-13 17:11:19 +0200 |
| commit | be267be8b191d5fac9f65a29e047470f364315eb (patch) | |
| tree | 80cdb3f7c1d53fc6209fac2d57ff9a4052e2750e /tools/perf/util/unwind.h | |
| parent | d5cb2aef4fda355fbafe8db4f425b73ea94d2019 (diff) | |
| parent | 9ec3f4e437ede2f3b5087d412abe16a0219b3b99 (diff) | |
| download | linux-be267be8b191d5fac9f65a29e047470f364315eb.tar.gz linux-be267be8b191d5fac9f65a29e047470f364315eb.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 and fixes from Arnaldo Carvalho de Melo:
* Remove die()/exit() calls from several tools.
* Add missing perf_regs.h file to MANIFEST
* Clean up and improve 'perf sched' performance by elliminating lots of
needless calls to libtraceevent.
* More patches to make perf build on Android, from Irina Tirdea
* Resolve vdso callchains, 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/unwind.h')
| -rw-r--r-- | tools/perf/util/unwind.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/perf/util/unwind.h b/tools/perf/util/unwind.h index 919bd6ad8501..a78c8b303bb5 100644 --- a/tools/perf/util/unwind.h +++ b/tools/perf/util/unwind.h @@ -22,11 +22,12 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg, int unwind__arch_reg_id(int regnum); #else static inline int -unwind__get_entries(unwind_entry_cb_t cb __used, void *arg __used, - struct machine *machine __used, - struct thread *thread __used, - u64 sample_uregs __used, - struct perf_sample *data __used) +unwind__get_entries(unwind_entry_cb_t cb __maybe_unused, + void *arg __maybe_unused, + struct machine *machine __maybe_unused, + struct thread *thread __maybe_unused, + u64 sample_uregs __maybe_unused, + struct perf_sample *data __maybe_unused) { return 0; } |