Move kernelcompat.h to include/ust/ and share.h, usterr.h to include/

[ust.git] / libust / marker-control.c

diff --git a/libust/marker-control.c b/libust/marker-control.c
index 29c43b09816e9ccf196b883335756b0999e90faf..a0786bad6fb306af26c8c1c300b01d5f2526f1db 100644 (file)
--- a/libust/marker-control.c
+++ b/libust/marker-control.c
@@ -1,19 +1,19 @@
 /*
  * Copyright (C) 2007 Mathieu Desnoyers
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * 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.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  *
  * LTT marker control module over /proc
  */
@@ -31,10 +31,12 @@
 //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 <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;