wrapper: remove random wrapper

[lttng-modules.git] / lttng-events.c

diff --git a/lttng-events.c b/lttng-events.c
index b2eeec71d556712fff83ffba13fae75d10be7b2d..5ecdd7320e8cff0308ff9b4ebb1bd30f6d155a52 100644 (file)
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -24,7 +24,7 @@
 #include <linux/vmalloc.h>
 #include <linux/limits.h>
 
-#include <wrapper/random.h>
+#include <linux/random.h>
 #include <lttng-kernel-version.h>
 #include <lttng-events.h>
 #include <lttng-tracer.h>
@@ -32,8 +32,8 @@
 #include <lttng-endian.h>
 #include <lttng-string-utils.h>
 #include <lttng-tracepoint.h>
-#include <wrapper/ringbuffer/backend.h>
-#include <wrapper/ringbuffer/frontend.h>
+#include <include/ringbuffer/backend.h>
+#include <include/ringbuffer/frontend.h>
 
 #define METADATA_CACHE_DEFAULT_SIZE 4096
 
@@ -71,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)
@@ -2588,7 +2574,7 @@ static
 int _lttng_session_metadata_statedump(struct lttng_session *session)
 {
        unsigned char *uuid_c = session->uuid.b;
-       unsigned char uuid_s[37], clock_uuid_s[BOOT_ID_LEN];
+       unsigned char uuid_s[LTTNG_MODULES_UUID_STR_LEN], clock_uuid_s[LTTNG_MODULES_UUID_STR_LEN];
        const char *product_uuid;
        struct lttng_channel *chan;
        struct lttng_event *event;
@@ -2798,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;
 
@@ -2914,17 +2898,6 @@ 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;