X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-events.c;h=b2eeec71d556712fff83ffba13fae75d10be7b2d;hb=265eca02b48054bbc719247875d79eabfd82a69e;hp=ff13b7c09f9aa76e72e754a5525c086837411cc5;hpb=48ccd619dac8aa4f6752db0efe07b821082828e2;p=lttng-modules.git

diff --git a/lttng-events.c b/lttng-events.c
index ff13b7c0..b2eeec71 100644
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -7,12 +7,6 @@
  * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-/*
- * This page_alloc.h wrapper needs to be included before gfpflags.h because it
- * overrides a function with a define.
- */
-#include "wrapper/page_alloc.h"
-
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/sched.h>
@@ -31,7 +25,6 @@
 #include <linux/limits.h>
 
 #include <wrapper/random.h>
-#include <wrapper/list.h>
 #include <lttng-kernel-version.h>
 #include <lttng-events.h>
 #include <lttng-tracer.h>
@@ -617,7 +610,7 @@ struct lttng_event *_lttng_event_create(struct lttng_channel *chan,
 	name_len = strlen(event_name);
 	hash = jhash(event_name, name_len, 0);
 	head = &session->events_ht.table[hash & (LTTNG_EVENT_HT_SIZE - 1)];
-	lttng_hlist_for_each_entry(event, head, hlist) {
+	hlist_for_each_entry(event, head, hlist) {
 		WARN_ON_ONCE(!event->desc);
 		if (!strncmp(event->desc->name, event_name,
 					LTTNG_KERNEL_SYM_NAME_LEN - 1)
@@ -1003,7 +996,7 @@ void *id_list_start(struct seq_file *m, loff_t *pos)
 		for (i = 0; i < LTTNG_ID_TABLE_SIZE; i++) {
 			struct hlist_head *head = &id_tracker_p->id_hash[i];
 
-			lttng_hlist_for_each_entry(e, head, hlist) {
+			hlist_for_each_entry(e, head, hlist) {
 				if (iter++ >= *pos)
 					return e;
 			}
@@ -1033,7 +1026,7 @@ void *id_list_next(struct seq_file *m, void *p, loff_t *ppos)
 		for (i = 0; i < LTTNG_ID_TABLE_SIZE; i++) {
 			struct hlist_head *head = &id_tracker_p->id_hash[i];
 
-			lttng_hlist_for_each_entry(e, head, hlist) {
+			hlist_for_each_entry(e, head, hlist) {
 				if (iter++ >= *ppos)
 					return e;
 			}
@@ -1300,7 +1293,7 @@ void lttng_create_tracepoint_if_missing(struct lttng_enabler *enabler)
 			 */
 			hash = jhash(event_name, name_len, 0);
 			head = &session->events_ht.table[hash & (LTTNG_EVENT_HT_SIZE - 1)];
-			lttng_hlist_for_each_entry(event, head, hlist) {
+			hlist_for_each_entry(event, head, hlist) {
 				if (event->desc == desc
 						&& event->chan == enabler->chan)
 					found = 1;
@@ -2936,12 +2929,6 @@ static int __init lttng_events_init(void)
 {
 	int ret;
 
-	ret = wrapper_get_pfnblock_flags_mask_init();
-	if (ret)
-		return ret;
-	ret = wrapper_get_pageblock_flags_mask_init();
-	if (ret)
-		return ret;
 	ret = lttng_probes_init();
 	if (ret)
 		return ret;