Drop 'linux/uprobes.h' wrapper

[lttng-modules.git] / src / probes / lttng-uprobes.c

diff --git a/src/probes/lttng-uprobes.c b/src/probes/lttng-uprobes.c
index b6531a71e16df3938e364023c9d767319f71f2c6..549fa6628364bb124f537dc13e9f9333dcee2bde 100644 (file)
--- a/src/probes/lttng-uprobes.c
+++ b/src/probes/lttng-uprobes.c
@@ -15,12 +15,13 @@
 #include <linux/namei.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
+#include <linux/uprobes.h>
+
 #include <lttng/events.h>
 #include <lttng/events-internal.h>
 #include <lttng/tracer.h>
 #include <wrapper/irqflags.h>
 #include <ringbuffer/frontend_types.h>
-#include <wrapper/uprobes.h>
 #include <wrapper/vmalloc.h>
 
 static
@@ -101,7 +102,7 @@ int lttng_uprobes_event_handler_pre(struct uprobe_consumer *uc, struct pt_regs *
 static const struct lttng_kernel_event_field *event_fields[] = {
        lttng_kernel_static_event_field("ip",
                lttng_kernel_static_type_integer_from_type(unsigned long, __BYTE_ORDER, 16),
-               false, false, false),
+               false, false),
 };
 
 static const struct lttng_kernel_tracepoint_class tp_class = {
@@ -201,7 +202,7 @@ int lttng_uprobes_add_callsite(struct lttng_uprobe *uprobe,
                goto register_error;
        }
 
-       ret = wrapper_uprobe_register(uprobe->inode,
+       ret = uprobe_register(uprobe->inode,
                      uprobe_handler->offset, &uprobe_handler->up_consumer);
        if (ret) {
                printk(KERN_WARNING "LTTng: Error registering probe on inode %lu "
@@ -280,7 +281,7 @@ void lttng_uprobes_unregister(struct inode *inode, struct list_head *head)
         * and free the struct.
         */
        list_for_each_entry_safe(iter, tmp, head, node) {
-               wrapper_uprobe_unregister(inode, iter->offset, &iter->up_consumer);
+               uprobe_unregister(inode, iter->offset, &iter->up_consumer);
                list_del(&iter->node);
                kfree(iter);
        }