X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-tracepoint.c;h=3d0cafd764fb85ee7edecd85c28f6a0ae16df6dd;hb=e3888df8ef6dcbc48e13d348b05e40a4f3acf639;hp=42bae9ae0eeb6868b73394226b0cc22b7c10cc2e;hpb=b7cdc18250880cc44edeef4a4b42c8ac7a135a6d;p=lttng-modules.git

diff --git a/lttng-tracepoint.c b/lttng-tracepoint.c
index 42bae9ae..3d0cafd7 100644
--- a/lttng-tracepoint.c
+++ b/lttng-tracepoint.c
@@ -16,8 +16,6 @@
 #include <linux/module.h>
 
 #include <lttng-tracepoint.h>
-#include <wrapper/list.h>
-#include <wrapper/tracepoint.h>
 
 /*
  * Protect the tracepoint table. lttng_tracepoint_mutex nests within
@@ -107,7 +105,7 @@ struct tracepoint_entry *get_tracepoint(const char *name)
 	u32 hash = jhash(name, strlen(name), 0);
 
 	head = &tracepoint_table[hash & (TRACEPOINT_TABLE_SIZE - 1)];
-	lttng_hlist_for_each_entry(e, head, hlist) {
+	hlist_for_each_entry(e, head, hlist) {
 		if (!strcmp(name, e->name))
 			return e;
 	}
@@ -127,7 +125,7 @@ struct tracepoint_entry *add_tracepoint(const char *name)
 	u32 hash = jhash(name, name_len - 1, 0);
 
 	head = &tracepoint_table[hash & (TRACEPOINT_TABLE_SIZE - 1)];
-	lttng_hlist_for_each_entry(e, head, hlist) {
+	hlist_for_each_entry(e, head, hlist) {
 		if (!strcmp(name, e->name)) {
 			printk(KERN_NOTICE
 				"tracepoint %s busy\n", name);
@@ -229,7 +227,7 @@ int lttng_tracepoint_coming(struct tp_module *tp_mod)
 		struct tracepoint_entry *e;
 		struct lttng_tp_probe *p;
 
-		tp = lttng_tracepoint_ptr_deref(&tp_mod->mod->tracepoints_ptrs[i]);
+		tp = tracepoint_ptr_deref(&tp_mod->mod->tracepoints_ptrs[i]);
 		e = get_tracepoint(tp->name);
 		if (!e) {
 			e = add_tracepoint(tp->name);
@@ -270,7 +268,7 @@ int lttng_tracepoint_going(struct tp_module *tp_mod)
 		struct tracepoint_entry *e;
 		struct lttng_tp_probe *p;
 
-		tp = lttng_tracepoint_ptr_deref(&tp_mod->mod->tracepoints_ptrs[i]);
+		tp = tracepoint_ptr_deref(&tp_mod->mod->tracepoints_ptrs[i]);
 		e = get_tracepoint(tp->name);
 		if (!e || !e->tp)
 			continue;