From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752416AbbJWIbJ (ORCPT ); Fri, 23 Oct 2015 04:31:09 -0400 Received: from terminus.zytor.com ([198.137.202.10]:55596 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750905AbbJWIbG (ORCPT ); Fri, 23 Oct 2015 04:31:06 -0400 Date: Fri, 23 Oct 2015 01:30:35 -0700 From: tip-bot for Scott Wood Message-ID: Cc: rostedt@goodmis.org, david@fromorbit.com, tglx@linutronix.de, acme@redhat.com, linux-kernel@vger.kernel.org, scottwood@freescale.com, mingo@kernel.org, hpa@zytor.com Reply-To: rostedt@goodmis.org, david@fromorbit.com, tglx@linutronix.de, acme@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org, scottwood@freescale.com, hpa@zytor.com In-Reply-To: <20150831211637.GA12848@home.buserror.net> References: <20150831211637.GA12848@home.buserror.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools lib traceevent: Support %ps/%pS Git-Commit-ID: b6bd9c7d543ac160646a667470158c5da319a85c 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: b6bd9c7d543ac160646a667470158c5da319a85c Gitweb: http://git.kernel.org/tip/b6bd9c7d543ac160646a667470158c5da319a85c Author: Scott Wood AuthorDate: Mon, 31 Aug 2015 16:16:37 -0500 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 22 Oct 2015 15:39:42 -0300 tools lib traceevent: Support %ps/%pS Commits such as 65dd297ac25565 ("xfs: %pF is only for function pointers") caused a regression because pretty_print() didn't support %ps/%pS. The current %pf/%pF implementation in pretty_print() is what %ps/%pS is supposed to do, so use the same code for %ps/%pS. Addressing the incorrect %pf/%pF implementation is beyond the scope of this patch. Signed-off-by: Scott Wood Acked-by: Steven Rostedt Cc: Dave Chinner Link: http://lkml.kernel.org/r/20150831211637.GA12848@home.buserror.net Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/traceevent/event-parse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index 9aa107a..2a912df 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -4905,8 +4905,8 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event else ls = 2; - if (*(ptr+1) == 'F' || - *(ptr+1) == 'f') { + if (*(ptr+1) == 'F' || *(ptr+1) == 'f' || + *(ptr+1) == 'S' || *(ptr+1) == 's') { ptr++; show_func = *ptr; } else if (*(ptr+1) == 'M' || *(ptr+1) == 'm') {