X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=probes%2Flttng-kretprobes.c;h=d208292622135ec5a36ae11166c395bbeb149062;hb=c1fcde59b2c8506bd169da40328f7311d373daed;hp=4b18d46077df8749c7c01dfea52c67384b3f0406;hpb=caa068b55f4fecb477cd370bca394fd4d232a539;p=lttng-modules.git

diff --git a/probes/lttng-kretprobes.c b/probes/lttng-kretprobes.c
index 4b18d460..d2082926 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
  *
@@ -13,7 +13,6 @@
 #include <linux/kref.h>
 #include <lttng-events.h>
 #include <wrapper/ringbuffer/frontend_types.h>
-#include <wrapper/vmalloc.h>
 #include <wrapper/irqflags.h>
 #include <lttng-tracer.h>
 #include <blacklist/kprobes.h>
@@ -130,21 +129,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;
@@ -216,13 +215,6 @@ int lttng_kretprobes_register(const char *name,
 	kref_init(&lttng_krp->kref_register);
 	kref_get(&lttng_krp->kref_register);	/* inc refcount to 2, no overflow. */
 
-	/*
-	 * Ensure the memory we just allocated don't trigger page faults.
-	 * Well.. kprobes itself puts the page fault handler on the blacklist,
-	 * but we can never be too careful.
-	 */
-	wrapper_vmalloc_sync_all();
-
 	ret = register_kretprobe(&lttng_krp->krp);
 	if (ret)
 		goto register_error;