X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=probes%2Flttng-kretprobes.c;h=83c26ab19211a938477648705b38e1adffca4f1c;hb=39848b23f3afb4e6a51550a9d12e5610fbfdb8b5;hp=9ef4eefac06ceeadf12be02458b55f6e1b527f7a;hpb=b7cdc18250880cc44edeef4a4b42c8ac7a135a6d;p=lttng-modules.git

diff --git a/probes/lttng-kretprobes.c b/probes/lttng-kretprobes.c
index 9ef4eefa..83c26ab1 100644
--- a/probes/lttng-kretprobes.c
+++ b/probes/lttng-kretprobes.c
@@ -12,11 +12,9 @@
 #include <linux/slab.h>
 #include <linux/kref.h>
 #include <lttng-events.h>
-#include <wrapper/ringbuffer/frontend_types.h>
-#include <wrapper/vmalloc.h>
+#include <include/ringbuffer/frontend_types.h>
 #include <wrapper/irqflags.h>
 #include <lttng-tracer.h>
-#include <blacklist/kprobes.h>
 
 enum lttng_kretprobe_type {
 	EVENT_ENTRY = 0,
@@ -130,21 +128,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 +214,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;