X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Fust%2Fmarker.h;h=a1f55b0b76338f6db9fa7d4c7309b3f7f6ba862c;hb=773655f35716237829e6e252e27165ca4044f930;hp=6103629fc722152cfbd3d439d981f533bf10da2c;hpb=f403cf491504b0213d066db974bd10c7f8c19da1;p=ust.git

diff --git a/include/ust/marker.h b/include/ust/marker.h
index 6103629..a1f55b0 100644
--- a/include/ust/marker.h
+++ b/include/ust/marker.h
@@ -75,7 +75,11 @@ struct marker {
 	const char *tp_name;	/* Optional tracepoint name */
 	void *tp_cb;		/* Optional tracepoint callback */
 	void *location;		/* Address of marker in code */
-} __attribute__((aligned(8)));
+} __attribute__((aligned(128)));/*
+				 * Aligned on 128 bytes because it is
+				 * globally visible and gcc happily
+				 * align these on the structure size.
+				 */
 
 #define GET_MARKER(channel, name)	(__mark_##channel##_##name)
 
@@ -143,7 +147,7 @@ struct marker {
 		__attribute__((section("__markers_strings")))		\
 		= #channel "\0" #name "\0" format;			\
 		static struct marker GET_MARKER(channel, name)		\
-		__attribute__((section("__markers"), aligned(8))) =	\
+		__attribute__((section("__markers"), aligned(128))) =	\
 		{ __mstrtab_##channel##_##name,				\
 			&__mstrtab_##channel##_##name[sizeof(#channel)],	\
 			&__mstrtab_##channel##_##name[sizeof(#channel) + sizeof(#name)],		\
@@ -330,7 +334,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);