X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=probes%2Flttng.c;h=09045fac18529702ad2ceac0ce7319c8cf2f549b;hb=148486bb788774289a3710c684c4693b5176e715;hp=80256876ceac417173c464a498bb875ace324a97;hpb=0c95667685cf8612eb0d231883874c173b7bb5a1;p=lttng-modules.git

diff --git a/probes/lttng.c b/probes/lttng.c
index 80256876..09045fac 100644
--- a/probes/lttng.c
+++ b/probes/lttng.c
@@ -28,21 +28,24 @@
 #include <linux/proc_fs.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include "../wrapper/vmalloc.h"
-#include "../lttng-events.h"
+#include <wrapper/vmalloc.h>
+#include <lttng-events.h>
 
 #define TP_MODULE_NOAUTOLOAD
 #define LTTNG_PACKAGE_BUILD
 #define CREATE_TRACE_POINTS
-#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module
+#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module
 #define TRACE_INCLUDE_FILE lttng
+#define LTTNG_INSTRUMENTATION
 
-#include "../instrumentation/events/lttng-module/lttng.h"
+#include <instrumentation/events/lttng-module/lttng.h>
 
 /* Events written through logger are truncated at 1024 bytes */
 #define LTTNG_LOGGER_COUNT_MAX	1024
 #define LTTNG_LOGGER_FILE	"lttng-logger"
 
+DEFINE_TRACE(lttng_logger);
+
 static struct proc_dir_entry *lttng_logger_dentry;
 
 /**
@@ -62,7 +65,7 @@ static
 ssize_t lttng_logger_write(struct file *file, const char __user *user_buf,
 		    size_t count, loff_t *ppos)
 {
-	unsigned int nr_pages = 1, i;
+	int nr_pages = 1, i;
 	unsigned long uaddr = (unsigned long) user_buf;
 	struct page *pages[2];
 	ssize_t written;
@@ -126,7 +129,7 @@ error:
 	return ret;
 }
 
-void __exit lttng_logger_exit(void)
+void lttng_logger_exit(void)
 {
 	__lttng_events_exit__lttng();
 	if (lttng_logger_dentry)