X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=probes%2Flttng-kprobes.c;h=c4605500f630b2786f3d053d4c81b51d79e3e410;hb=92bfdd34a957065459bbc60b0ad94cec6a2f7f2b;hp=c0a15e47a0c0b4db1cef98c27cf960dead54790f;hpb=caa068b55f4fecb477cd370bca394fd4d232a539;p=lttng-modules.git

diff --git a/probes/lttng-kprobes.c b/probes/lttng-kprobes.c
index c0a15e47..c4605500 100644
--- a/probes/lttng-kprobes.c
+++ b/probes/lttng-kprobes.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-kprobes.c
  *
@@ -12,10 +12,8 @@
 #include <linux/slab.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>
 
 static
 int lttng_kprobes_handler_pre(struct kprobe *p, struct pt_regs *regs)
@@ -76,12 +74,12 @@ int lttng_create_kprobe_event(const char *name, struct lttng_event *event)
 	}
 	field->name = "ip";
 	field->type.atype = atype_integer;
-	field->type.u.basic.integer.size = sizeof(unsigned long) * CHAR_BIT;
-	field->type.u.basic.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
-	field->type.u.basic.integer.signedness = lttng_is_signed_type(unsigned long);
-	field->type.u.basic.integer.reverse_byte_order = 0;
-	field->type.u.basic.integer.base = 16;
-	field->type.u.basic.integer.encoding = lttng_encode_none;
+	field->type.u.integer.size = sizeof(unsigned long) * CHAR_BIT;
+	field->type.u.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
+	field->type.u.integer.signedness = lttng_is_signed_type(unsigned long);
+	field->type.u.integer.reverse_byte_order = 0;
+	field->type.u.integer.base = 16;
+	field->type.u.integer.encoding = lttng_encode_none;
 	desc->owner = THIS_MODULE;
 	event->desc = desc;
 
@@ -127,13 +125,6 @@ int lttng_kprobes_register(const char *name,
 	event->u.kprobe.kp.offset = offset;
 	event->u.kprobe.kp.addr = (void *) (unsigned long) addr;
 
-	/*
-	 * 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_kprobe(&event->u.kprobe.kp);
 	if (ret)
 		goto register_error;