X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-filter-validator.c;h=c9094547fa47bef52d0b00e53b609f635d4b87b5;hb=3bc8535a1d829ec1b7d34a36ffe6e5b22be5cfe1;hp=c479af08153c1d152793f2a4a9260ac7b11b21ed;hpb=5b75072deeaab8992353afce7f32ecc6b809442f;p=lttng-modules.git

diff --git a/lttng-filter-validator.c b/lttng-filter-validator.c
index c479af08..c9094547 100644
--- a/lttng-filter-validator.c
+++ b/lttng-filter-validator.c
@@ -11,7 +11,6 @@
 #include <linux/jhash.h>
 #include <linux/slab.h>
 
-#include <wrapper/list.h>
 #include <lttng-filter.h>
 
 #define MERGE_POINT_TABLE_BITS		7
@@ -75,7 +74,7 @@ int merge_point_add_check(struct mp_table *mp_table, unsigned long target_pc,
 	memcpy(&mp_node->stack, stack, sizeof(mp_node->stack));
 
 	head = &mp_table->mp_head[hash & (MERGE_POINT_TABLE_SIZE - 1)];
-	lttng_hlist_for_each_entry(lookup_node, head, node) {
+	hlist_for_each_entry(lookup_node, head, node) {
 		if (lttng_hash_match(lookup_node, target_pc)) {
 			found = 1;
 			break;
@@ -538,7 +537,7 @@ unsigned long delete_all_nodes(struct mp_table *mp_table)
 		struct hlist_head *head;
 
 		head = &mp_table->mp_head[i];
-		lttng_hlist_for_each_entry_safe(mp_node, tmp, head, node) {
+		hlist_for_each_entry_safe(mp_node, tmp, head, node) {
 			kfree(mp_node);
 			nr_nodes++;
 		}
@@ -1099,7 +1098,7 @@ int validate_instruction_all_contexts(struct bytecode_runtime *bytecode,
 	/* Validate merge points */
 	hash = jhash_1word(target_pc, 0);
 	head = &mp_table->mp_head[hash & (MERGE_POINT_TABLE_SIZE - 1)];
-	lttng_hlist_for_each_entry(mp_node, head, node) {
+	hlist_for_each_entry(mp_node, head, node) {
 		if (lttng_hash_match(mp_node, target_pc)) {
 			found = 1;
 			break;