Remove dummy markers/tracepoints/trace events

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

diff --git a/include/ust/marker.h b/include/ust/marker.h
index c565268dcf70e409402df3356b5ec63fa82b15ac..604aa23fa798dec2c72a830090e18d745a0a87da 100644 (file)
--- a/include/ust/marker.h
+++ b/include/ust/marker.h
@@ -113,8 +113,8 @@ struct marker {
                        _ASM_PTR "(__mstrtab_" __stringify(channel) "_" __stringify(name) "_format_" __stringify(unique) ")\n\t" /* format string */ \
                        ".byte 0\n\t" /* state imv */                                           \
                        ".byte 0\n\t" /* ptype */                                                       \
-                       ".word 0\n\t" /* channel_id */                                          \
-                       ".word 0\n\t" /* event_id */                                            \
+                       ".hword 0\n\t" /* channel_id */                                         \
+                       ".hword 0\n\t" /* event_id */                                           \
                        ".balign " __stringify(__WORDSIZE) " / 8\n\t" /* alignment */                   \
                        _ASM_PTR "(marker_probe_cb)\n\t" /* call */                             \
                        _ASM_PTR "(__mark_empty_function)\n\t" /* marker_probe_closure single.field1 */ \
@@ -345,6 +345,8 @@ extern int marker_unregister_lib(struct marker * const *markers_start);
 #define MARKER_LIB                                                     \
        extern struct marker * const __start___markers_ptrs[] __attribute__((weak, visibility("hidden"))); \
        extern struct marker * const __stop___markers_ptrs[] __attribute__((weak, visibility("hidden"))); \
+       static struct marker * const __mark_ptr_dummy                   \
+               __attribute__((used, section("__markers_ptrs"))) = NULL;\
                                                                        \
        static void __attribute__((constructor)) __markers__init(void)  \
        {                                                               \