remove usage of the marker_addr section

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

diff --git a/include/ust/marker.h b/include/ust/marker.h
index db4671e0e9805fffe043de3072f7ac8dd9e9e3da..27dd8fe8880d4b499363983cf10c235d07453c9f 100644 (file)
--- a/include/ust/marker.h
+++ b/include/ust/marker.h
@@ -101,8 +101,8 @@ struct marker {
                  NULL, tp_name_str, tp_cb, NULL };                             \
                                                                                \
                /* This next asm has to be a basic inline asm (no input/output/clobber),        \
-                  because it must not need %-sign escaping, as we most certainly               \
-                  have some in the format string. */                                           \
+                  because it must not require %-sign escaping, as we most certainly            \
+                  have some %-signs in the format string. */                                   \
                asm volatile (                                                                  \
                     ".section __markers_strings,\"aw\",@progbits\n\t"                          \
                     "__mstrtab_" XSTR(channel) "_" XSTR(name) "_" XSTR(unique) ":\n\t"         \
@@ -350,40 +350,18 @@ struct lib {
        struct list_head list;
 };
 
-extern int marker_register_lib(struct marker *markers_start,
-                              struct marker_addr *marker_addr_start,
-                              int markers_count);
-
-#ifdef CONFIG_UST_GDB_INTEGRATION
+extern int marker_register_lib(struct marker *markers_start, int markers_count);
 
 #define MARKER_LIB                                                     \
        extern struct marker __start___markers[] __attribute__((weak, visibility("hidden"))); \
        extern struct marker __stop___markers[] __attribute__((weak, visibility("hidden"))); \
-       extern struct marker_addr __start___marker_addr[] __attribute__((weak, visibility("hidden"))); \
-       extern struct marker_addr __stop___marker_addr[] __attribute__((weak, visibility("hidden"))); \
                                                                        \
        static void __attribute__((constructor)) __markers__init(void)  \
        {                                                               \
-               marker_register_lib(__start___markers, /*__start___marker_addr*/ NULL, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker)); \
+               marker_register_lib(__start___markers, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker)); \
        }
 
 extern void marker_set_new_marker_cb(void (*cb)(struct marker *));
 extern void init_markers(void);
 
-#else /* CONFIG_UST_GDB_INTEGRATION */
-
-#define MARKER_LIB                                                     \
-       extern struct marker __start___markers[] __attribute__((weak, visibility("hidden"))); \
-       extern struct marker __stop___markers[] __attribute__((weak, visibility("hidden"))); \
-                                                                       \
-       static void __attribute__((constructor)) __markers__init(void)  \
-       {                                                               \
-               marker_register_lib(__start___markers, NULL, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker)); \
-       }
-
-extern void marker_set_new_marker_cb(void (*cb)(struct marker *));
-extern void init_markers(void);
-
-#endif /* CONFIG_UST_GDB_INTEGRATION */
-
 #endif /* _UST_MARKER_H */