diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-12-08 15:18:41 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-12-08 15:18:41 +0100 |
| commit | adc1ef1e37358d3c17d1a74a58b2e104fc0bda15 (patch) | |
| tree | 6f43107a76ed87f2b817594d2d62246ab82cfba6 /tools/perf/util/hist.h | |
| parent | 84e53ff77cb1e005f49966cd6789109d84acc9e2 (diff) | |
| parent | 07ac002f2fcc74c5be47b656d9201d5de84dc53d (diff) | |
| download | op-kernel-dev-adc1ef1e37358d3c17d1a74a58b2e104fc0bda15.zip op-kernel-dev-adc1ef1e37358d3c17d1a74a58b2e104fc0bda15.tar.gz | |
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:
- UAPI fixes, from David Howels
- Separate perf tests into multiple objects, one per test, from Jiri Olsa.
- Fixes to /proc/pid/maps parsing, preparatory to supporting data maps,
from Namhyung Kim
- Fix compile error for non-NEWT builds, from Namhyung Kim
- Implement ui_progress for GTK, from Namhyung Kim
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/hist.h')
| -rw-r--r-- | tools/perf/util/hist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h index 1278c2c..8b091a5 100644 --- a/tools/perf/util/hist.h +++ b/tools/perf/util/hist.h @@ -195,7 +195,7 @@ static inline int hist_entry__tui_annotate(struct hist_entry *self return 0; } -static inline int script_browse(const char *script_opt) +static inline int script_browse(const char *script_opt __maybe_unused) { return 0; } |
