diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-12-11 08:47:25 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-12-11 08:47:25 +0100 |
| commit | 54c9238cfd495d234b0e02fa7dcce5b1671a42dd (patch) | |
| tree | e72b7bd3620c5d949fbd7f8efe8fb0a3b03e02bf /tools/perf/util/parse-options.c | |
| parent | d18929e9fde30c4d57ae57eb9a7f6f10b5808ca1 (diff) | |
| parent | e7a7865cc0da306542db0b9205cb0a467f59e33d (diff) | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core refactorings and fixes from Arnaldo Carvalho de Melo:
Infrastructure changes:
- Revert "perf tools: Improve setting of gcc debug option", -Og is broken,
GCC PR created (Jiri Olsa)
- More reference count fixes (Masami Hiramatsu)
- Untangle browser setup (--stdio, --tui, etc) from argument checking,
prep work to move the usage() code out of tools/perf for use by
other tools/ living utilities (Namhyung Kim)
- Delete half-processed hist entries when exiting 'perf top' (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/parse-options.c')
| -rw-r--r-- | tools/perf/util/parse-options.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tools/perf/util/parse-options.c b/tools/perf/util/parse-options.c index d09aff983581..de3290b47db1 100644 --- a/tools/perf/util/parse-options.c +++ b/tools/perf/util/parse-options.c @@ -766,7 +766,6 @@ int usage_with_options_internal(const char * const *usagestr, void usage_with_options(const char * const *usagestr, const struct option *opts) { - exit_browser(false); usage_with_options_internal(usagestr, opts, 0, NULL); exit(129); } @@ -776,8 +775,6 @@ void usage_with_options_msg(const char * const *usagestr, { va_list ap; - exit_browser(false); - va_start(ap, fmt); strbuf_addv(&error_buf, fmt, ap); va_end(ap); |