git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next
Head SHA1: 7fd13615992ae0fc132c9abb24511be43f3b5d9d
Gustavo Padovan (1):
tracing/dma-buf/fence: Fix timeline str value on fence_annotate_wait_on
----
include/trace/events/fence.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---------------------------
commit 7fd13615992ae0fc132c9abb24511be43f3b5d9d
Author: Gustavo Padovan <gustavo.pado...@collabora.co.uk>
Date: Thu Jan 21 09:48:14 2016 -0200
tracing/dma-buf/fence: Fix timeline str value on fence_annotate_wait_on
timeline was wrongly assigned with ->get_driver_name().
Link:
http://lkml.kernel.org/r/1453376895-30747-1-git-send-email-gust...@padovan.org
Signed-off-by: Gustavo Padovan <gustavo.pado...@collabora.co.uk>
Signed-off-by: Steven Rostedt <rost...@goodmis.org>
diff --git a/include/trace/events/fence.h b/include/trace/events/fence.h
index 98feb1b82896..d6dfa05ba322 100644
--- a/include/trace/events/fence.h
+++ b/include/trace/events/fence.h
@@ -17,7 +17,7 @@ TRACE_EVENT(fence_annotate_wait_on,
TP_STRUCT__entry(
__string(driver, fence->ops->get_driver_name(fence))
- __string(timeline, fence->ops->get_driver_name(fence))
+ __string(timeline, fence->ops->get_timeline_name(fence))
__field(unsigned int, context)
__field(unsigned int, seqno)
