Add backward compatibility for tracepoints (qemu-kvm is using them)

[ust.git] / include / ust / marker.h

diff --git a/include/ust/marker.h b/include/ust/marker.h
index af15ad4efee84be05dcda5b76c4f53cdb6532771..dbdbbe09f75bea1ddbedf8a4f00cb94205070c63 100644 (file)
--- a/include/ust/marker.h
+++ b/include/ust/marker.h
@@ -32,6 +32,7 @@
 #include <urcu/list.h>
 
 struct ust_marker;
+struct ust_marker_probe_array;
 
 /**
  * ust_marker_probe_func - Type of a marker probe function
@@ -68,7 +69,7 @@ struct ust_marker {
        uint16_t event_id;      /* Numeric event identifier, dynamic */
        void (*call)(const struct ust_marker *mdata, void *call_private, ...);
        struct ust_marker_probe_closure single;
-       struct ust_marker_probe_closure *multi;
+       struct ust_marker_probe_array *multi;
        const char *tp_name;    /* Optional tracepoint name */
        void *tp_cb;            /* Optional tracepoint callback */
 };
@@ -126,11 +127,6 @@ struct ust_marker {
 #define ust_marker(name, format, args...) \
        __ust_marker(ust, name, NULL, format, ## args)
 
-static inline __attribute__((deprecated))
-void __trace_mark_is_deprecated()
-{
-}
-
 /**
  * UST_MARKER_NOARGS - Format string for a marker with no argument.
  */
@@ -195,7 +191,6 @@ int ust_marker_unregister_lib(struct ust_marker * const *ust_marker_start);
  * ust_marker().
  */
 #define trace_mark(channel, name, format, args...)     \
-       __trace_mark_is_deprecated();                   \
        ust_marker(name, format, ## args)
 
 static inline __attribute__((deprecated))