wrapper: remove atomic.h wrapper

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

diff --git a/lttng-syscalls.c b/lttng-syscalls.c
index e1f1809808573367b701b62cfe9a90d4af8e075c..18a906a48f3f3a05ba58523204c46b78555e46c3 100644 (file)
--- a/lttng-syscalls.c
+++ b/lttng-syscalls.c
@@ -23,12 +23,12 @@
 #include <asm/syscall.h>
 
 #include <lib/bitfield.h>
-#include <wrapper/file.h>
 #include <wrapper/rcu.h>
-#include <wrapper/syscall.h>
 #include <lttng-events.h>
 #include "lttng-tracepoint.h"
 
+#define LTTNG_SYSCALL_NR_ARGS  6
+
 #ifndef CONFIG_COMPAT
 # ifndef is_compat_task
 #  define is_compat_task()     (0)
@@ -377,7 +377,7 @@ static void syscall_entry_unknown(struct lttng_event *event,
 {
        unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
-       lttng_syscall_get_arguments(current, regs, args);
+       syscall_get_arguments(current, regs, args);
        if (unlikely(in_compat_syscall()))
                __event_probe__compat_syscall_entry_unknown(event, id, args);
        else
@@ -448,7 +448,7 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id)
                void (*fptr)(void *__data, unsigned long arg0) = entry->func;
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
-               lttng_syscall_get_arguments(current, regs, args);
+               syscall_get_arguments(current, regs, args);
                fptr(event, args[0]);
                break;
        }
@@ -459,7 +459,7 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id)
                        unsigned long arg1) = entry->func;
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
-               lttng_syscall_get_arguments(current, regs, args);
+               syscall_get_arguments(current, regs, args);
                fptr(event, args[0], args[1]);
                break;
        }
@@ -471,7 +471,7 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id)
                        unsigned long arg2) = entry->func;
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
-               lttng_syscall_get_arguments(current, regs, args);
+               syscall_get_arguments(current, regs, args);
                fptr(event, args[0], args[1], args[2]);
                break;
        }
@@ -484,7 +484,7 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id)
                        unsigned long arg3) = entry->func;
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
-               lttng_syscall_get_arguments(current, regs, args);
+               syscall_get_arguments(current, regs, args);
                fptr(event, args[0], args[1], args[2], args[3]);
                break;
        }
@@ -498,7 +498,7 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id)
                        unsigned long arg4) = entry->func;
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
-               lttng_syscall_get_arguments(current, regs, args);
+               syscall_get_arguments(current, regs, args);
                fptr(event, args[0], args[1], args[2], args[3], args[4]);
                break;
        }
@@ -513,7 +513,7 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id)
                        unsigned long arg5) = entry->func;
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
-               lttng_syscall_get_arguments(current, regs, args);
+               syscall_get_arguments(current, regs, args);
                fptr(event, args[0], args[1], args[2],
                        args[3], args[4], args[5]);
                break;
@@ -528,7 +528,7 @@ static void syscall_exit_unknown(struct lttng_event *event,
 {
        unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
-       lttng_syscall_get_arguments(current, regs, args);
+       syscall_get_arguments(current, regs, args);
        if (unlikely(in_compat_syscall()))
                __event_probe__compat_syscall_exit_unknown(event, id, ret,
                        args);
@@ -604,7 +604,7 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret)
                        unsigned long arg0) = entry->func;
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
-               lttng_syscall_get_arguments(current, regs, args);
+               syscall_get_arguments(current, regs, args);
                fptr(event, ret, args[0]);
                break;
        }
@@ -616,7 +616,7 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret)
                        unsigned long arg1) = entry->func;
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
-               lttng_syscall_get_arguments(current, regs, args);
+               syscall_get_arguments(current, regs, args);
                fptr(event, ret, args[0], args[1]);
                break;
        }
@@ -629,7 +629,7 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret)
                        unsigned long arg2) = entry->func;
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
-               lttng_syscall_get_arguments(current, regs, args);
+               syscall_get_arguments(current, regs, args);
                fptr(event, ret, args[0], args[1], args[2]);
                break;
        }
@@ -643,7 +643,7 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret)
                        unsigned long arg3) = entry->func;
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
-               lttng_syscall_get_arguments(current, regs, args);
+               syscall_get_arguments(current, regs, args);
                fptr(event, ret, args[0], args[1], args[2], args[3]);
                break;
        }
@@ -658,7 +658,7 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret)
                        unsigned long arg4) = entry->func;
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
-               lttng_syscall_get_arguments(current, regs, args);
+               syscall_get_arguments(current, regs, args);
                fptr(event, ret, args[0], args[1], args[2], args[3], args[4]);
                break;
        }
@@ -674,7 +674,7 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret)
                        unsigned long arg5) = entry->func;
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
-               lttng_syscall_get_arguments(current, regs, args);
+               syscall_get_arguments(current, regs, args);
                fptr(event, ret, args[0], args[1], args[2],
                        args[3], args[4], args[5]);
                break;
@@ -1295,7 +1295,7 @@ int lttng_abi_syscall_list(void)
        struct file *syscall_list_file;
        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;