X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libust%2Fmarker.c;fp=libust%2Fmarker.c;h=8ca028c3e0f38f36cbadf18fabcb413452a6011c;hb=900e307ed99ca9cb4bfe574ee4f4e1bd9c1baccc;hp=664f59c61c6495229ba4661206e267b5e5a7635c;hpb=103fffbc740f24681dfb5d9c7bb78b44f285036d;p=ust.git

diff --git a/libust/marker.c b/libust/marker.c
index 664f59c..8ca028c 100644
--- a/libust/marker.c
+++ b/libust/marker.c
@@ -35,8 +35,8 @@
 __thread long ust_reg_stack[500];
 volatile __thread long *ust_reg_stack_ptr = (long *) 0;
 
-extern struct marker * const __start___markers[] __attribute__((visibility("hidden")));
-extern struct marker * const __stop___markers[] __attribute__((visibility("hidden")));
+extern struct marker * const __start___markers_ptrs[] __attribute__((visibility("hidden")));
+extern struct marker * const __stop___markers_ptrs[] __attribute__((visibility("hidden")));
 
 /* Set to 1 to enable marker debug output */
 static const int marker_debug;
@@ -743,10 +743,6 @@ static void lib_update_markers(void)
  */
 static void marker_update_probes(void)
 {
-	/* Core kernel markers */
-//ust//	marker_update_probe_range(__start___markers, __stop___markers);
-	/* Markers in modules. */
-//ust//	module_update_markers();
 	lib_update_markers();
 	tracepoint_probe_update_all();
 	/* Update immediate values */
@@ -1132,17 +1128,7 @@ static void marker_get_iter(struct marker_iter *iter)
 {
 	int found = 0;
 
-	/* Core kernel markers */
-	if (!iter->lib) {
-		/* ust FIXME: how come we cannot disable the following line? we shouldn't need core stuff */
-		found = marker_get_iter_range(&iter->marker,
-				__start___markers, __stop___markers);
-		if (found)
-			goto end;
-	}
-	/* Markers in modules. */
 	found = lib_get_iter_markers(iter);
-end:
 	if (!found)
 		marker_iter_reset(iter);
 }
@@ -1415,15 +1401,15 @@ static int initialized = 0;
 
 void __attribute__((constructor)) init_markers(void)
 {
-	if(!initialized) {
-		marker_register_lib(__start___markers,
-			(((long)__stop___markers) - ((long)__start___markers))
-				/ sizeof(*__start___markers));
+	if (!initialized) {
+		marker_register_lib(__start___markers_ptrs,
+			__stop___markers_ptrs
+			- __start___markers_ptrs);
 		initialized = 1;
 	}
 }
 
 void __attribute__((constructor)) destroy_markers(void)
 {
-	marker_unregister_lib(__start___markers);
+	marker_unregister_lib(__start___markers_ptrs);
 }