wrapper: remove atomic.h wrapper

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

diff --git a/lttng-events.c b/lttng-events.c
index 61439ec7c788efa49b3a4c910fe2d9c0a2cf79d6..dbf267f811f5f0865c1f387219cefd334800fea9 100644 (file)
--- 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,23 +17,22 @@
 #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/tracepoint.h>
 #include <wrapper/list.h>
-#include <wrapper/types.h>
 #include <lttng-kernel-version.h>
 #include <lttng-events.h>
 #include <lttng-tracer.h>
 #include <lttng-abi-old.h>
 #include <lttng-endian.h>
 #include <lttng-string-utils.h>
+#include <lttng-tracepoint.h>
 #include <wrapper/ringbuffer/backend.h>
 #include <wrapper/ringbuffer/frontend.h>
 
@@ -822,9 +815,9 @@ void register_event(struct lttng_event *event)
        desc = event->desc;
        switch (event->instrumentation) {
        case LTTNG_KERNEL_TRACEPOINT:
-               ret = lttng_wrapper_tracepoint_probe_register(desc->kname,
-                                                 desc->probe_callback,
-                                                 event);
+               ret = lttng_tracepoint_probe_register(desc->kname,
+                                               desc->probe_callback,
+                                               event);
                break;
        case LTTNG_KERNEL_SYSCALL:
                ret = lttng_syscall_filter_enable(event->chan,
@@ -858,7 +851,7 @@ int _lttng_event_unregister(struct lttng_event *event)
        desc = event->desc;
        switch (event->instrumentation) {
        case LTTNG_KERNEL_TRACEPOINT:
-               ret = lttng_wrapper_tracepoint_probe_unregister(event->desc->kname,
+               ret = lttng_tracepoint_probe_unregister(event->desc->kname,
                                                  event->desc->probe_callback,
                                                  event);
                break;
@@ -1139,7 +1132,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 +1177,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;
 }
@@ -2937,15 +2930,6 @@ static int __init lttng_events_init(void)
 {
        int ret;
 
-       ret = wrapper_lttng_fixup_sig(THIS_MODULE);
-       if (ret)
-               return 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;