X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fust%2Fmarker.h;h=481bc79b0f42e7295ef6c284498f6123db76b8bd;hb=5389de4dde9f6c008db07d19ba6f721eb23a025a;hp=13d81040c91d3b3edd910bf683d171bcceca908d;hpb=f36c12ab311c7db808bfeda93bb95022020110cd;p=ust.git

diff --git a/include/ust/marker.h b/include/ust/marker.h
index 13d8104..481bc79 100644
--- 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(ust, name, format, args)
+
 /**
  * ust_marker_tp - Marker in a tracepoint callback
  * @name: marker name, not quoted.