Markers: trace_mark should not pass "ust" to ust_mark

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

diff --git a/include/ust/marker.h b/include/ust/marker.h
index 13d81040c91d3b3edd910bf683d171bcceca908d..2c34bd7b12979b16e0048801b38ace7a7be0b16f 100644 (file)
--- a/include/ust/marker.h
+++ b/include/ust/marker.h
@@ -8,8 +8,8 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -124,7 +124,7 @@ struct ust_marker {
                        _ASM_PTR "(1f)\n\t" /* location */                                              \
                        ".previous\n\t"                                                         \
                        /*".section __ust_marker_ptrs\n\t"*/ \
-                       ".section __ust_marker_ptrs,\"a\"\n\t"                                  \
+                       ".section __ust_marker_ptrs,\"aw\"\n\t"                                 \
                        _ASM_PTR "(2b)\n\t"                                                     \
                        ".previous\n\t"                                                         \
                        "1:\n\t"                                                                \
@@ -204,6 +204,20 @@ extern void ust_marker_update_probe_range(struct ust_marker * const *begin,
 #define ust_marker(name, format, args...) \
        __ust_marker(ust, name, NULL, format, ## args)
 
+
+/*
+ * trace_mark() -- TO BE DEPRECATED
+ * @channel: name prefix, not quoted. Ignored.
+ * @name: marker name, not quoted.
+ * @format: format string
+ * @args...: variable argument list
+ *
+ * Kept as a compatibility API and will be *DEPRECATED* in favor of
+ * ust_marker().
+ */
+#define trace_mark(channel, name, format, args...)     \
+       ust_marker(name, format, ## args)
+
 /**
  * ust_marker_tp - Marker in a tracepoint callback
  * @name: marker name, not quoted.
@@ -223,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);