diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-06-05 10:44:44 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-06-05 10:44:44 +0200 |
| commit | b13fa91421213a8d1fd05086050f05e994f3b72d (patch) | |
| tree | ba546a451c07ce05f143a56c2baae07d2cfdf6de /tools/perf/ui/browser.c | |
| parent | 9b261365dd73a5014b49033327ad881708e81f33 (diff) | |
| parent | fc9cabeabf42d76854059e7bce81a02645e7e5ca (diff) | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/core
Pull perf/core improvements and fixes from Jiri Olsa:
* Warn the user when trace command is not available (Arnaldo Carvalho de Melo)
* Add warning when disabling perl scripting support due to missing devel files (Arnaldo Carvalho de Melo)
* Consider header files outside perf directory in tags target (Sebastian Andrzej Siewior)
* Allow overriding sysfs and proc finding with env var (Cody P Schafer)
* Fix "==" into "=" in ui_browser__warning assignment (zhangdianfang)
* Factor elide bool handling in sort code (Jiri Olsa)
* Fix poll return value propagation (Jiri Olsa)
* Fix 'make help' message error (Jianyu Zhan)
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/ui/browser.c')
| -rw-r--r-- | tools/perf/ui/browser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c index d11541d4d7d7..3ccf6e14f89b 100644 --- a/tools/perf/ui/browser.c +++ b/tools/perf/ui/browser.c @@ -194,7 +194,7 @@ int ui_browser__warning(struct ui_browser *browser, int timeout, ui_helpline__vpush(format, args); va_end(args); } else { - while ((key == ui__question_window("Warning!", text, + while ((key = ui__question_window("Warning!", text, "Press any key...", timeout)) == K_RESIZE) ui_browser__handle_resize(browser); |