Markers: Add MARKER_LIB backward compatibility

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

diff --git a/include/ust/marker.h b/include/ust/marker.h
index 481bc79b0f42e7295ef6c284498f6123db76b8bd..009548fb533ecf5f1da5732dc8b6280af16e56b1 100644 (file)
--- a/include/ust/marker.h
+++ b/include/ust/marker.h
@@ -216,7 +216,7 @@ extern void ust_marker_update_probe_range(struct ust_marker * const *begin,
  * ust_marker().
  */
 #define trace_mark(channel, name, format, args...)     \
-       ust_marker(ust, name, format, args)
+       ust_marker(name, format, ## args)
 
 /**
  * ust_marker_tp - Marker in a tracepoint callback
@@ -237,6 +237,12 @@ extern void ust_marker_update_probe_range(struct ust_marker * const *begin,
  */
 #define UST_MARKER_NOARGS " "
 
+/**
+ * MARKER_NOARGS - Compatibility API. Will be *DEPRECATED*. Use
+ * UST_MARKER_NOARGS instead.
+ */
+#define MARK_NOARGS    UST_MARKER_NOARGS
+
 extern void lock_ust_marker(void);
 extern void unlock_ust_marker(void);
 
@@ -347,6 +353,12 @@ extern int ust_marker_unregister_lib(struct ust_marker * const *ust_marker_start
                ust_marker_unregister_lib(__start___ust_marker_ptrs);   \
        }
 
+/*
+ * MARKER_LIB is kept for backward compatibility and will be
+ * *DEPRECATED*. Use UST_MARKER_LIB instead.
+ */
+#define MARKER_LIB     UST_MARKER_LIB
+
 extern void ust_marker_set_new_ust_marker_cb(void (*cb)(struct ust_marker *));
 extern void init_ust_marker(void);