Tracepoint and TRACEPOINT_EVENT API cleanup

[ust.git] / libust / tracepoint.c

diff --git a/libust/tracepoint.c b/libust/tracepoint.c
index 1c4669b535890a444bacbd0805a509fb05c5f38f..6a8795b70c218498446d7b16370cfb62d484c88f 100644 (file)
--- a/libust/tracepoint.c
+++ b/libust/tracepoint.c
@@ -4,8 +4,8 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,16 +19,17 @@
  * Ported to userspace by Pierre-Marc Fournier.
  */
 
+#define _LGPL_SOURCE
 #include <errno.h>
 #include <ust/tracepoint.h>
+#include <ust/tracepoint-internal.h>
 #include <ust/core.h>
 #include <ust/kcompat/kcompat.h>
-#include "usterr_signal_safe.h"
-
-#define _LGPL_SOURCE
 #include <urcu-bp.h>
 #include <urcu/hlist.h>
 
+#include "usterr_signal_safe.h"
+
 //extern struct tracepoint __start___tracepoints[] __attribute__((visibility("hidden")));
 //extern struct tracepoint __stop___tracepoints[] __attribute__((visibility("hidden")));
 
@@ -354,14 +355,14 @@ tracepoint_add_probe(const char *name, void *probe, void *data)
 }
 
 /**
- * tracepoint_probe_register -  Connect a probe to a tracepoint
+ * __tracepoint_probe_register -  Connect a probe to a tracepoint
  * @name: tracepoint name
  * @probe: probe handler
  *
  * Returns 0 if ok, error value on error.
  * The probe address must at least be aligned on the architecture pointer size.
  */
-int tracepoint_probe_register(const char *name, void *probe, void *data)
+int __tracepoint_probe_register(const char *name, void *probe, void *data)
 {
        void *old;
 
@@ -375,7 +376,6 @@ int tracepoint_probe_register(const char *name, void *probe, void *data)
        release_probes(old);
        return 0;
 }
-//ust// EXPORT_SYMBOL_GPL(tracepoint_probe_register);
 
 static void *tracepoint_remove_probe(const char *name, void *probe, void *data)
 {
@@ -404,7 +404,7 @@ static void *tracepoint_remove_probe(const char *name, void *probe, void *data)
  * itself uses stop_machine(), which insures that every preempt disabled section
  * have finished.
  */
-int tracepoint_probe_unregister(const char *name, void *probe, void *data)
+int __tracepoint_probe_unregister(const char *name, void *probe, void *data)
 {
        void *old;
 
@@ -418,7 +418,6 @@ int tracepoint_probe_unregister(const char *name, void *probe, void *data)
        release_probes(old);
        return 0;
 }
-//ust// EXPORT_SYMBOL_GPL(tracepoint_probe_unregister);
 
 static CDS_LIST_HEAD(old_probes);
 static int need_update;