X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-abi.h;h=dc230d86dab4d75b60eccc29f39f8fbd0a6c0c6c;hb=37303c7509bf98243512fbcd54f481e62f215c4b;hp=aaeceb62091bd172b7b8291ca0e0dbd70c01253f;hpb=8e099bae48ebd43bd5da4cd93e33cdcab7bdb74b;p=lttng-modules.git

diff --git a/lttng-abi.h b/lttng-abi.h
index aaeceb62..dc230d86 100644
--- a/lttng-abi.h
+++ b/lttng-abi.h
@@ -4,11 +4,23 @@
 /*
  * lttng-abi.h
  *
- * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
  * LTTng ABI header
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * 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/fs.h>
@@ -46,7 +58,6 @@ struct lttng_kernel_channel {
 	char padding[LTTNG_KERNEL_CHANNEL_PADDING];
 };
 
-#define LTTNG_KERNEL_KRETPROBE_PADDING	LTTNG_KERNEL_SYM_NAME_LEN + 32
 struct lttng_kernel_kretprobe {
 	uint64_t addr;
 
@@ -57,7 +68,6 @@ struct lttng_kernel_kretprobe {
 /*
  * Either addr is used, or symbol_name and offset.
  */
-#define LTTNG_KERNEL_KPROBE_PADDING	LTTNG_KERNEL_SYM_NAME_LEN + 32
 struct lttng_kernel_kprobe {
 	uint64_t addr;
 
@@ -65,7 +75,6 @@ struct lttng_kernel_kprobe {
 	char symbol_name[LTTNG_KERNEL_SYM_NAME_LEN];
 };
 
-#define LTTNG_KERNEL_FUNCTION_TRACER_PADDING	LTTNG_KERNEL_SYM_NAME_LEN + 32
 struct lttng_kernel_function_tracer {
 	char symbol_name[LTTNG_KERNEL_SYM_NAME_LEN];
 };
@@ -90,9 +99,9 @@ struct lttng_kernel_event {
 };
 
 struct lttng_kernel_tracer_version {
-	uint32_t version;
+	uint32_t major;
+	uint32_t minor;
 	uint32_t patchlevel;
-	uint32_t sublevel;
 };
 
 enum lttng_kernel_calibrate_type {