X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Fust%2Fmarker.h;h=0f42d5b1941f3d63036ad6839b55bb4c085854c1;hb=0222e1213f196b66cbc08cd29093aca4a28e9ffb;hp=7670648ba4b36738765e440707f8eba0f19003f6;hpb=f91aa7301fe975dc6b1d5583f7ffb6c4d2dbf325;p=ust.git

diff --git a/include/ust/marker.h b/include/ust/marker.h
index 7670648..0f42d5b 100644
--- a/include/ust/marker.h
+++ b/include/ust/marker.h
@@ -77,9 +77,6 @@ struct marker {
 	void *location;		/* Address of marker in code */
 } __attribute__((aligned(8)));
 
-#define CONFIG_MARKERS
-#ifdef CONFIG_MARKERS
-
 #define GET_MARKER(channel, name)	(__mark_##channel##_##name)
 
 #define _DEFINE_MARKER(channel, name, tp_name_str, tp_cb, format, unique, m)			\
@@ -200,25 +197,6 @@ struct marker {
 extern void marker_update_probe_range(struct marker *begin,
 	struct marker *end);
 
-#else /* !CONFIG_MARKERS */
-#define DEFINE_MARKER(channel, name, tp_name, tp_cb, format, m)
-#define __trace_mark(generic, channel, name, call_private, format, args...) \
-		__mark_check_format(format, ## args)
-#define __trace_mark_tp(channel, name, call_private, tp_name, tp_cb,	\
-		format, args...)					\
-	do {								\
-		void __check_tp_type(void)				\
-		{							\
-			register_trace_##tp_name(tp_cb, call_private);		\
-		}							\
-		__mark_check_format(format, ## args);			\
-	} while (0)
-static inline void marker_update_probe_range(struct marker *begin,
-	struct marker *end)
-{ }
-#define GET_MARKER(channel, name)
-#endif /* CONFIG_MARKERS */
-
 /**
  * trace_mark - Marker using code patching
  * @channel: marker channel (where to send the data), not quoted.
@@ -352,7 +330,7 @@ struct lib {
 	struct marker_addr *markers_addr_start;
 #endif
 	int markers_count;
-	struct list_head list;
+	struct cds_list_head list;
 };
 
 extern int marker_register_lib(struct marker *markers_start, int markers_count);