X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=probes%2Flttng-uprobes.c;h=2cc23bb674f70adec98f8f1ffa635de47f164a2d;hb=refs%2Ftags%2Ffor-upstreaming-review-1;hp=10f435fec989cdb3ab0829e6aea8fb924fac1c6e;hpb=b7cdc18250880cc44edeef4a4b42c8ac7a135a6d;p=lttng-modules.git

diff --git a/probes/lttng-uprobes.c b/probes/lttng-uprobes.c
index 10f435fe..2cc23bb6 100644
--- a/probes/lttng-uprobes.c
+++ b/probes/lttng-uprobes.c
@@ -15,12 +15,11 @@
 #include <linux/namei.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
-#include <lttng-events.h>
-#include <lttng-tracer.h>
+#include <linux/uprobes.h>
+#include <lttng/lttng-events.h>
+#include <lttng/lttng-tracer.h>
 #include <wrapper/irqflags.h>
-#include <wrapper/ringbuffer/frontend_types.h>
-#include <wrapper/uprobes.h>
-#include <wrapper/vmalloc.h>
+#include <ringbuffer/frontend_types.h>
 
 static
 int lttng_uprobes_handler_pre(struct uprobe_consumer *uc, struct pt_regs *regs)
@@ -92,12 +91,12 @@ int lttng_create_uprobe_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;
 
 	desc->owner = THIS_MODULE;
 	event->desc = desc;
@@ -160,9 +159,6 @@ int lttng_uprobes_add_callsite(struct lttng_event *event,
 		goto end;
 	}
 
-	/* Ensure the memory we just allocated don't trigger page faults. */
-	wrapper_vmalloc_sync_all();
-
 	uprobe_handler->event = event;
 	uprobe_handler->up_consumer.handler = lttng_uprobes_handler_pre;
 
@@ -171,8 +167,8 @@ int lttng_uprobes_add_callsite(struct lttng_event *event,
 		goto register_error;
 	}
 
-	ret = wrapper_uprobe_register(event->u.uprobe.inode,
-		      uprobe_handler->offset, &uprobe_handler->up_consumer);
+	ret = uprobe_register(event->u.uprobe.inode,
+			      uprobe_handler->offset, &uprobe_handler->up_consumer);
 	if (ret) {
 		printk(KERN_WARNING "Error registering probe on inode %lu "
 		       "and offset 0x%llx\n", event->u.uprobe.inode->i_ino,
@@ -229,8 +225,8 @@ void lttng_uprobes_unregister(struct lttng_event *event)
 	 * and free the struct.
 	 */
 	list_for_each_entry_safe(iter, tmp, &event->u.uprobe.head, node) {
-		wrapper_uprobe_unregister(event->u.uprobe.inode, iter->offset,
-			&iter->up_consumer);
+		uprobe_unregister(event->u.uprobe.inode, iter->offset,
+				  &iter->up_consumer);
 		list_del(&iter->node);
 		kfree(iter);
 	}