X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-events.c;h=b7bdac54ef25978b76b1df0ba7439709776d9ac1;hb=3a6d1bf9efe2ae2703eab391cbaef510f4c1ea46;hp=c16cff803d94d3ef0b0fec1717a2dcb452682054;hpb=0d260d3d3e28849772a060a9b1374712c0959fca;p=lttng-modules.git

diff --git a/lttng-events.c b/lttng-events.c
index c16cff80..b7bdac54 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>
@@ -23,16 +17,14 @@
 #include <linux/seq_file.h>
 #include <linux/file.h>
 #include <linux/anon_inodes.h>
-#include <wrapper/file.h>
 #include <linux/jhash.h>
 #include <linux/uaccess.h>
 #include <linux/uuid.h>
 #include <linux/dmi.h>
 #include <linux/vmalloc.h>
+#include <linux/limits.h>
 
 #include <wrapper/random.h>
-#include <wrapper/list.h>
-#include <wrapper/types.h>
 #include <lttng-kernel-version.h>
 #include <lttng-events.h>
 #include <lttng-tracer.h>
@@ -79,21 +71,7 @@ int _lttng_field_statedump(struct lttng_session *session,
 
 void synchronize_trace(void)
 {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0))
 	synchronize_rcu();
-#else
-	synchronize_sched();
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
-#ifdef CONFIG_PREEMPT_RT_FULL
-	synchronize_rcu();
-#endif
-#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */
-#ifdef CONFIG_PREEMPT_RT
-	synchronize_rcu();
-#endif
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */
 }
 
 void lttng_lock_sessions(void)
@@ -618,7 +596,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)
@@ -1004,7 +982,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;
 			}
@@ -1034,7 +1012,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;
 			}
@@ -1139,7 +1117,7 @@ int lttng_session_list_tracker_ids(struct lttng_session *session,
 	struct seq_file *m;
 	int file_fd, ret;
 
-	file_fd = lttng_get_unused_fd();
+	file_fd = get_unused_fd_flags(0);
 	if (file_fd < 0) {
 		ret = file_fd;
 		goto fd_error;
@@ -1184,8 +1162,8 @@ static
 int lttng_match_enabler_star_glob(const char *desc_name,
 		const char *pattern)
 {
-	if (!strutils_star_glob_match(pattern, LTTNG_SIZE_MAX,
-			desc_name, LTTNG_SIZE_MAX))
+	if (!strutils_star_glob_match(pattern, SIZE_MAX,
+			desc_name, SIZE_MAX))
 		return 0;
 	return 1;
 }
@@ -1301,7 +1279,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;
@@ -2806,8 +2784,6 @@ void lttng_transport_unregister(struct lttng_transport *transport)
 }
 EXPORT_SYMBOL_GPL(lttng_transport_unregister);
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
-
 enum cpuhp_state lttng_hp_prepare;
 enum cpuhp_state lttng_hp_online;
 
@@ -2922,27 +2898,10 @@ static void __exit lttng_exit_cpu_hotplug(void)
 	cpuhp_remove_multi_state(lttng_hp_prepare);
 }
 
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
-static int lttng_init_cpu_hotplug(void)
-{
-	return 0;
-}
-static void lttng_exit_cpu_hotplug(void)
-{
-}
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
-
-
 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;