X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Fmarker-control.c;h=a0786bad6fb306af26c8c1c300b01d5f2526f1db;hb=fbca6b624335eef18c8d86194aeb101a720168f4;hp=bb51bb7202738c9e3d90c5f3e052fa58a46384a7;hpb=34e4b7db790ca5ff678eae7cf5658455a8991870;p=ust.git

diff --git a/libust/marker-control.c b/libust/marker-control.c
index bb51bb7..a0786ba 100644
--- a/libust/marker-control.c
+++ b/libust/marker-control.c
@@ -31,10 +31,12 @@
 //ust// #include <linux/mutex.h>
 //ust// #include <linux/seq_file.h>
 //ust// #include <linux/slab.h>
-#include "kernelcompat.h"
+#include <ctype.h>
+
+#include <ust/kernelcompat.h>
 //#include "list.h"
 #include "tracer.h"
-#include "localerr.h"
+#include "usterr.h"
 
 #define DEFAULT_CHANNEL "cpu"
 #define DEFAULT_PROBE "default"
@@ -85,6 +87,7 @@ static struct ltt_available_probe *get_probe_from_name(const char *pname)
 		return NULL;
 }
 
+/* (unused)
 static char *skip_spaces(char *buf)
 {
 	while (*buf != '\0' && isspace(*buf))
@@ -106,6 +109,7 @@ static void get_marker_string(char *buf, char **start,
 	*end = skip_nonspaces(*start);
 	**end = '\0';
 }
+*/
 
 int ltt_probe_register(struct ltt_available_probe *pdata)
 {
@@ -131,7 +135,6 @@ end:
 	mutex_unlock(&probes_mutex);
 	return ret;
 }
-EXPORT_SYMBOL_GPL(ltt_probe_register);
 
 /*
  * Called when a probe does not want to be called anymore.
@@ -157,7 +160,6 @@ end:
 	mutex_unlock(&probes_mutex);
 	return ret;
 }
-EXPORT_SYMBOL_GPL(ltt_probe_unregister);
 
 /*
  * Connect marker "mname" to probe "pname".
@@ -203,7 +205,6 @@ end:
 	ltt_unlock_traces();
 	return ret;
 }
-EXPORT_SYMBOL_GPL(ltt_marker_connect);
 
 /*
  * Disconnect marker "mname", probe "pname".
@@ -243,7 +244,6 @@ end:
 	mutex_unlock(&probes_mutex);
 	return ret;
 }
-EXPORT_SYMBOL_GPL(ltt_marker_disconnect);
 
 /*
  * function handling proc entry write.
@@ -435,7 +435,7 @@ void __attribute__((constructor)) init_marker_control(void)
 }
 //ust// module_init(marker_control_init);
 
-static void __exit marker_control_exit(void)
+static void __attribute__((destructor)) marker_control_exit(void)
 {
 	int ret;