From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760752AbcCEIUQ (ORCPT ); Sat, 5 Mar 2016 03:20:16 -0500 Received: from torg.zytor.com ([198.137.202.12]:58924 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751478AbcCEIUK (ORCPT ); Sat, 5 Mar 2016 03:20:10 -0500 Date: Sat, 5 Mar 2016 00:19:54 -0800 From: "tip-bot for Steven Rostedt (Red Hat)" Message-ID: Cc: rostedt@goodmis.org, akpm@linux-foundation.org, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org, acme@redhat.com Reply-To: linux-kernel@vger.kernel.org, mingo@kernel.org, acme@redhat.com, akpm@linux-foundation.org, rostedt@goodmis.org, tglx@linutronix.de, hpa@zytor.com In-Reply-To: <20160209204237.337024613@goodmis.org> References: <20160209204237.337024613@goodmis.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools lib traceevent: Fix output of %llu for 64 bit values read on 32 bit machines Git-Commit-ID: a66673a07e260807f570db8f08a9c1207932c665 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: a66673a07e260807f570db8f08a9c1207932c665 Gitweb: http://git.kernel.org/tip/a66673a07e260807f570db8f08a9c1207932c665 Author: Steven Rostedt (Red Hat) AuthorDate: Tue, 9 Feb 2016 15:40:17 -0500 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 3 Mar 2016 11:10:38 -0300 tools lib traceevent: Fix output of %llu for 64 bit values read on 32 bit machines When a long value is read on 32 bit machines for 64 bit output, the parsing needs to change "%lu" into "%llu", as the value is read natively. Unfortunately, if "%llu" is already there, the code will add another "l" to it and fail to parse it properly. Signed-off-by: Steven Rostedt Cc: Andrew Morton Link: http://lkml.kernel.org/r/20160209204237.337024613@goodmis.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/traceevent/event-parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index fb790aa..865dea5 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -4978,7 +4978,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event break; } } - if (pevent->long_size == 8 && ls && + if (pevent->long_size == 8 && ls == 1 && sizeof(long) != 8) { char *p;