X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=probes%2Flttng-probe-block.c;h=827ead21128c43ee0975f8f678e763a573dab571;hb=refs%2Fheads%2Fstable-2.9;hp=7bd5eaf08f6a4f0bd676017f1fc89ac61ef27084;hpb=d32a57a2d82d7d0a1d447e7052db9795bb0df2f1;p=lttng-modules.git

diff --git a/probes/lttng-probe-block.c b/probes/lttng-probe-block.c
index 7bd5eaf0..827ead21 100644
--- a/probes/lttng-probe-block.c
+++ b/probes/lttng-probe-block.c
@@ -1,23 +1,51 @@
 /*
  * probes/lttng-probe-block.c
  *
- * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
  * LTTng block probes.
+ *
+ * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * 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; only
+ * 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
+ * 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 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
  */
 
 #include <linux/module.h>
 #include <linux/blktrace_api.h>
+#include <lttng-tracer.h>
+#include <lttng-kernel-version.h>
+
+/*
+ * Create the tracepoint static inlines from the kernel to validate that our
+ * trace event macros match the kernel we run on.
+ */
+#include <trace/events/block.h>
+
+#include <wrapper/tracepoint.h>
 
 /*
  * Create LTTng tracepoint probes.
  */
 #define LTTNG_PACKAGE_BUILD
 #define CREATE_TRACE_POINTS
-#undef CONFIG_EVENT_TRACING	/* Don't create Ftrace probes */
+#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module
 
-#include <trace/events/block.h>
+#include <instrumentation/events/lttng-module/block.h>
 
 MODULE_LICENSE("GPL and additional rights");
 MODULE_AUTHOR("Mathieu Desnoyers <mathieu.desnoyers@efficios.com>");
 MODULE_DESCRIPTION("LTTng block probes");
+MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
+	__stringify(LTTNG_MODULES_MINOR_VERSION) "."
+	__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
+	LTTNG_MODULES_EXTRAVERSION);