X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=libust%2Fmarker-control.c;h=9ee5b7cd58e54771c05121b44b005b9c5bdb73e9;hb=518d7abb8e3720433c611499f704c3bd9d554102;hp=bb51bb7202738c9e3d90c5f3e052fa58a46384a7;hpb=34e4b7db790ca5ff678eae7cf5658455a8991870;p=ust.git

diff --git a/libust/marker-control.c b/libust/marker-control.c
index bb51bb7..9ee5b7c 100644
--- a/libust/marker-control.c
+++ b/libust/marker-control.c
@@ -18,23 +18,11 @@
  * LTT marker control module over /proc
  */
 
-//ust// #include <linux/proc_fs.h>
-//ust// #include <linux/module.h>
-//ust// #include <linux/stat.h>
-//ust// #include <linux/vmalloc.h>
-//ust// #include <linux/marker.h>
-//ust// #include <linux/ltt-tracer.h>
-//ust// #include <linux/uaccess.h>
-//ust// #include <linux/string.h>
-//ust// #include <linux/ctype.h>
-//ust// #include <linux/list.h>
-//ust// #include <linux/mutex.h>
-//ust// #include <linux/seq_file.h>
-//ust// #include <linux/slab.h>
-#include "kernelcompat.h"
-//#include "list.h"
+#include <ctype.h>
+#include <stdlib.h>
+
 #include "tracer.h"
-#include "localerr.h"
+#include "usterr.h"
 
 #define DEFAULT_CHANNEL "cpu"
 #define DEFAULT_PROBE "default"
@@ -85,6 +73,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 +95,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 +121,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 +146,6 @@ end:
 	mutex_unlock(&probes_mutex);
 	return ret;
 }
-EXPORT_SYMBOL_GPL(ltt_probe_unregister);
 
 /*
  * Connect marker "mname" to probe "pname".
@@ -203,7 +191,6 @@ end:
 	ltt_unlock_traces();
 	return ret;
 }
-EXPORT_SYMBOL_GPL(ltt_marker_connect);
 
 /*
  * Disconnect marker "mname", probe "pname".
@@ -243,7 +230,6 @@ end:
 	mutex_unlock(&probes_mutex);
 	return ret;
 }
-EXPORT_SYMBOL_GPL(ltt_marker_disconnect);
 
 /*
  * function handling proc entry write.
@@ -435,7 +421,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;