X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=probes%2Flttng-kretprobes.c;h=00675937a22416b9150bf24cf78925ed8ae07926;hb=4f47ccf08dfac3d5db7553eb8b40bdab19764727;hp=84eca9b350ff86c1c643695d01f7fbe927270bae;hpb=9f36eaed6f91d5897924b551b44d1edd8cee00e2;p=lttng-modules.git

diff --git a/probes/lttng-kretprobes.c b/probes/lttng-kretprobes.c
index 84eca9b3..00675937 100644
--- a/probes/lttng-kretprobes.c
+++ b/probes/lttng-kretprobes.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
  *
  * probes/lttng-kretprobes.c
  *
@@ -11,11 +11,12 @@
 #include <linux/kprobes.h>
 #include <linux/slab.h>
 #include <linux/kref.h>
-#include <lttng-events.h>
-#include <wrapper/ringbuffer/frontend_types.h>
+#include <lttng/events.h>
+#include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
 #include <wrapper/irqflags.h>
-#include <lttng-tracer.h>
+#include <lttng/tracer.h>
+#include <blacklist/kprobes.h>
 
 enum lttng_kretprobe_type {
 	EVENT_ENTRY = 0,
@@ -129,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;
@@ -220,7 +221,7 @@ int lttng_kretprobes_register(const char *name,
 	 * Well.. kprobes itself puts the page fault handler on the blacklist,
 	 * but we can never be too careful.
 	 */
-	wrapper_vmalloc_sync_all();
+	wrapper_vmalloc_sync_mappings();
 
 	ret = register_kretprobe(&lttng_krp->krp);
 	if (ret)