Merge tag 'trace-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[sfrench/cifs-2.6.git] / include / trace / events / dma_fence.h

diff --git a/include/trace/events/dma_fence.h b/include/trace/events/dma_fence.h
index d61bfddcc621f16ac4ca4a85348c483bf3f30d44..2212adda8f77f7d8cb44b0bdb0b22445b1fcb87d 100644 (file)
--- a/include/trace/events/dma_fence.h
+++ b/include/trace/events/dma_fence.h
@@ -9,46 +9,6 @@
 
 struct dma_fence;
 
-TRACE_EVENT(dma_fence_annotate_wait_on,
-
-       /* fence: the fence waiting on f1, f1: the fence to be waited on. */
-       TP_PROTO(struct dma_fence *fence, struct dma_fence *f1),
-
-       TP_ARGS(fence, f1),
-
-       TP_STRUCT__entry(
-               __string(driver, fence->ops->get_driver_name(fence))
-               __string(timeline, fence->ops->get_timeline_name(fence))
-               __field(unsigned int, context)
-               __field(unsigned int, seqno)
-
-               __string(waiting_driver, f1->ops->get_driver_name(f1))
-               __string(waiting_timeline, f1->ops->get_timeline_name(f1))
-               __field(unsigned int, waiting_context)
-               __field(unsigned int, waiting_seqno)
-       ),
-
-       TP_fast_assign(
-               __assign_str(driver, fence->ops->get_driver_name(fence))
-               __assign_str(timeline, fence->ops->get_timeline_name(fence))
-               __entry->context = fence->context;
-               __entry->seqno = fence->seqno;
-
-               __assign_str(waiting_driver, f1->ops->get_driver_name(f1))
-               __assign_str(waiting_timeline, f1->ops->get_timeline_name(f1))
-               __entry->waiting_context = f1->context;
-               __entry->waiting_seqno = f1->seqno;
-
-       ),
-
-       TP_printk("driver=%s timeline=%s context=%u seqno=%u "  \
-                 "waits on driver=%s timeline=%s context=%u seqno=%u",
-                 __get_str(driver), __get_str(timeline), __entry->context,
-                 __entry->seqno,
-                 __get_str(waiting_driver), __get_str(waiting_timeline),
-                 __entry->waiting_context, __entry->waiting_seqno)
-);
-
 DECLARE_EVENT_CLASS(dma_fence,
 
        TP_PROTO(struct dma_fence *fence),