From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753770AbbFSXSH (ORCPT ); Fri, 19 Jun 2015 19:18:07 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52803 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753353AbbFSXSA (ORCPT ); Fri, 19 Jun 2015 19:18:00 -0400 Date: Fri, 19 Jun 2015 16:17:44 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: mingo@kernel.org, linux-kernel@vger.kernel.org, fweisbec@gmail.com, acme@redhat.com, namhyung@kernel.org, eranian@google.com, bp@suse.de, jolsa@redhat.com, adrian.hunter@intel.com, tglx@linutronix.de, dzickus@redhat.com, hpa@zytor.com, dsahern@gmail.com Reply-To: linux-kernel@vger.kernel.org, mingo@kernel.org, fweisbec@gmail.com, namhyung@kernel.org, acme@redhat.com, jolsa@redhat.com, bp@suse.de, eranian@google.com, tglx@linutronix.de, adrian.hunter@intel.com, dzickus@redhat.com, hpa@zytor.com, dsahern@gmail.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf hists browser: React to unassigned hotkey pressing Git-Commit-ID: 3e323dc0a80c3921f30d03ca300426f70dc5a327 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 3e323dc0a80c3921f30d03ca300426f70dc5a327 Gitweb: http://git.kernel.org/tip/3e323dc0a80c3921f30d03ca300426f70dc5a327 Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 19 Jun 2015 17:49:29 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 19 Jun 2015 18:14:05 -0300 perf hists browser: React to unassigned hotkey pressing When that happens we were just ignoring the key press, now this message is presented in the bottom line (the help line): "Press '?' for help on key bindings" Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Don Zickus Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-iyma2j5kj3q9i1stl4mfh90n@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/hists.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index e2b500b..c42adb6 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -1902,10 +1902,11 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, case CTRL('c'): goto out_free_stack; case 'f': - if (is_report_browser(hbt)) - continue; - goto out_free_stack; + if (!is_report_browser(hbt)) + goto out_free_stack; + /* Fall thru */ default: + helpline = "Press '?' for help on key bindings"; continue; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/