X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=probes%2Flttng-kretprobes.c;h=40938f2b7110bd5506862d982ee8deca997bc614;hb=ceabb767180e064629b5a9ab4ed14449da864763;hp=d25862b1f451cc7b949985e895cc83625da02fab;hpb=1c124020c743254923d8e76ab5dcd1f69709982e;p=lttng-modules.git

diff --git a/probes/lttng-kretprobes.c b/probes/lttng-kretprobes.c
index d25862b1..40938f2b 100644
--- a/probes/lttng-kretprobes.c
+++ b/probes/lttng-kretprobes.c
@@ -1,23 +1,10 @@
-/*
-* probes/lttng-kretprobes.c
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
+ *
+ * probes/lttng-kretprobes.c
  *
  * LTTng kretprobes integration module.
  *
  * Copyright (C) 2009-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>
@@ -29,6 +16,7 @@
 #include <wrapper/vmalloc.h>
 #include <wrapper/irqflags.h>
 #include <lttng-tracer.h>
+#include <blacklist/kprobes.h>
 
 enum lttng_kretprobe_type {
 	EVENT_ENTRY = 0,
@@ -142,21 +130,21 @@ int lttng_create_kprobe_event(const char *name, struct lttng_event *event,
 	}
 	fields[0].name = "ip";
 	fields[0].type.atype = atype_integer;
-	fields[0].type.u.basic.integer.size = sizeof(unsigned long) * CHAR_BIT;
-	fields[0].type.u.basic.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
-	fields[0].type.u.basic.integer.signedness = lttng_is_signed_type(unsigned long);
-	fields[0].type.u.basic.integer.reverse_byte_order = 0;
-	fields[0].type.u.basic.integer.base = 16;
-	fields[0].type.u.basic.integer.encoding = lttng_encode_none;
+	fields[0].type.u.integer.size = sizeof(unsigned long) * CHAR_BIT;
+	fields[0].type.u.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
+	fields[0].type.u.integer.signedness = lttng_is_signed_type(unsigned long);
+	fields[0].type.u.integer.reverse_byte_order = 0;
+	fields[0].type.u.integer.base = 16;
+	fields[0].type.u.integer.encoding = lttng_encode_none;
 
 	fields[1].name = "parent_ip";
 	fields[1].type.atype = atype_integer;
-	fields[1].type.u.basic.integer.size = sizeof(unsigned long) * CHAR_BIT;
-	fields[1].type.u.basic.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
-	fields[1].type.u.basic.integer.signedness = lttng_is_signed_type(unsigned long);
-	fields[1].type.u.basic.integer.reverse_byte_order = 0;
-	fields[1].type.u.basic.integer.base = 16;
-	fields[1].type.u.basic.integer.encoding = lttng_encode_none;
+	fields[1].type.u.integer.size = sizeof(unsigned long) * CHAR_BIT;
+	fields[1].type.u.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
+	fields[1].type.u.integer.signedness = lttng_is_signed_type(unsigned long);
+	fields[1].type.u.integer.reverse_byte_order = 0;
+	fields[1].type.u.integer.base = 16;
+	fields[1].type.u.integer.encoding = lttng_encode_none;
 
 	desc->owner = THIS_MODULE;
 	event->desc = desc;