From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755352AbbCXQfO (ORCPT ); Tue, 24 Mar 2015 12:35:14 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56946 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753400AbbCXQfJ (ORCPT ); Tue, 24 Mar 2015 12:35:09 -0400 Date: Tue, 24 Mar 2015 09:34:47 -0700 From: "tip-bot for Steven Rostedt (Red Hat)" Message-ID: Cc: tglx@linutronix.de, namhyung@kernel.org, akpm@linux-foundation.org, jolsa@redhat.com, rostedt@goodmis.org, hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org, acme@redhat.com Reply-To: mingo@kernel.org, acme@redhat.com, rostedt@goodmis.org, jolsa@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, akpm@linux-foundation.org, namhyung@kernel.org, tglx@linutronix.de In-Reply-To: <20150324135923.461431960@goodmis.org> References: <20150324135923.461431960@goodmis.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools lib traceevent kbuffer: Remove extra update to data pointer in PADDING Git-Commit-ID: c5e691928bf166ac03430e957038b60adba3cf6c 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: c5e691928bf166ac03430e957038b60adba3cf6c Gitweb: http://git.kernel.org/tip/c5e691928bf166ac03430e957038b60adba3cf6c Author: Steven Rostedt (Red Hat) AuthorDate: Tue, 24 Mar 2015 09:57:55 -0400 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 24 Mar 2015 12:22:04 -0300 tools lib traceevent kbuffer: Remove extra update to data pointer in PADDING When a event PADDING is hit (a deleted event that is still in the ring buffer), translate_data() sets the length of the padding and also updates the data pointer which is passed back to the caller. This is unneeded because the caller also updates the data pointer with the passed back length. translate_data() should not update the pointer, only set the length. Signed-off-by: Steven Rostedt Cc: Andrew Morton Cc: Jiri Olsa Cc: Namhyung Kim Cc: stable@vger.kernel.org # 3.12+ Link: http://lkml.kernel.org/r/20150324135923.461431960@goodmis.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/traceevent/kbuffer-parse.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/lib/traceevent/kbuffer-parse.c b/tools/lib/traceevent/kbuffer-parse.c index dcc6652..deb3569 100644 --- a/tools/lib/traceevent/kbuffer-parse.c +++ b/tools/lib/traceevent/kbuffer-parse.c @@ -372,7 +372,6 @@ translate_data(struct kbuffer *kbuf, void *data, void **rptr, switch (type_len) { case KBUFFER_TYPE_PADDING: *length = read_4(kbuf, data); - data += *length; break; case KBUFFER_TYPE_TIME_EXTEND: