From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757051AbcCEINc (ORCPT ); Sat, 5 Mar 2016 03:13:32 -0500 Received: from torg.zytor.com ([198.137.202.12]:58484 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755992AbcCEINU (ORCPT ); Sat, 5 Mar 2016 03:13:20 -0500 Date: Sat, 5 Mar 2016 00:13:05 -0800 From: tip-bot for Taeung Song Message-ID: Cc: rostedt@goodmis.org, namhyung@kernel.org, hpa@zytor.com, acme@redhat.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, jolsa@kernel.org, mingo@kernel.org, treeze.taeung@gmail.com Reply-To: treeze.taeung@gmail.com, rostedt@goodmis.org, hpa@zytor.com, namhyung@kernel.org, acme@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, jolsa@kernel.org In-Reply-To: <1456492465-5946-1-git-send-email-treeze.taeung@gmail.com> References: <1456492465-5946-1-git-send-email-treeze.taeung@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf trace: Check and discard not only 'nr' but also '__syscall_nr' Git-Commit-ID: c42de706dad3f39c1f65e473a1d165ea33f8b6e8 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: c42de706dad3f39c1f65e473a1d165ea33f8b6e8 Gitweb: http://git.kernel.org/tip/c42de706dad3f39c1f65e473a1d165ea33f8b6e8 Author: Taeung Song AuthorDate: Fri, 26 Feb 2016 22:14:25 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 29 Feb 2016 11:34:28 -0300 perf trace: Check and discard not only 'nr' but also '__syscall_nr' Format fields of a syscall have the first variable '__syscall_nr' or 'nr' that mean the syscall number. But it isn't relevant here so drop it. 'nr' among fields of syscall was renamed '__syscall_nr'. So add exception handling to drop '__syscall_nr' and modify the comment for this excpetion handling. Reported-by: Arnaldo Carvalho de Melo Signed-off-by: Taeung Song Cc: Jiri Olsa Cc: Namhyung Kim Cc: Steven Rostedt Link: http://lkml.kernel.org/r/1456492465-5946-1-git-send-email-treeze.taeung@gmail.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-trace.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 26a337f..8dc98c5 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -1725,8 +1725,12 @@ static int trace__read_syscall_info(struct trace *trace, int id) sc->args = sc->tp_format->format.fields; sc->nr_args = sc->tp_format->format.nr_fields; - /* drop nr field - not relevant here; does not exist on older kernels */ - if (sc->args && strcmp(sc->args->name, "nr") == 0) { + /* + * We need to check and discard the first variable '__syscall_nr' + * or 'nr' that mean the syscall number. It is needless here. + * So drop '__syscall_nr' or 'nr' field but does not exist on older kernels. + */ + if (sc->args && (!strcmp(sc->args->name, "__syscall_nr") || !strcmp(sc->args->name, "nr"))) { sc->args = sc->args->next; --sc->nr_args; }