UST markers: fix structure alignment for recent gcc

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

diff --git a/include/ust/marker.h b/include/ust/marker.h
index 6103629fc722152cfbd3d439d981f533bf10da2c..a1f55b0b76338f6db9fa7d4c7309b3f7f6ba862c 100644 (file)
--- 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);