From: Steven Rostedt (Red Hat) Date: Tue, 24 Mar 2015 13:57:55 +0000 (-0400) Subject: tools lib traceevent kbuffer: Remove extra update to data pointer in PADDING X-Git-Tag: v3.18.14~115 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=06676db706e1f507862e1a84ffad394d5e1ec3c7;p=profile%2Fwearable%2Fplatform%2Fkernel%2Flinux-3.18-exynos7270.git tools lib traceevent kbuffer: Remove extra update to data pointer in PADDING [ Upstream commit c5e691928bf166ac03430e957038b60adba3cf6c ] 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 Signed-off-by: Sasha Levin --- 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: