wrapper: remove syscall wrapper

diff --git a/lttng-syscalls.c b/lttng-syscalls.c
index bdbaa5e9536462ac8ed1179be569b9a802822e1e..18a906a48f3f3a05ba58523204c46b78555e46c3 100644 (file)
--- a/lttng-syscalls.c
+++ b/lttng-syscalls.c
@@ -24,10 +24,11 @@
 
 #include <lib/bitfield.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)
@@ -376,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
@@ -447,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;
        }
@@ -458,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;
        }
@@ -470,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;
        }
@@ -483,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;
        }
@@ -497,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;
        }
@@ -512,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;
@@ -527,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);
@@ -603,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;
        }
@@ -615,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;
        }
@@ -628,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;
        }
@@ -642,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;
        }
@@ -657,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;
        }
@@ -673,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;

diff --git a/wrapper/syscall.h b/wrapper/syscall.h
deleted file mode 100644 (file)
index 671562b..0000000
--- a/wrapper/syscall.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
- *
- * wrapper/syscall.h
- *
- * wrapper around asm/syscall.h.
- *
- * Copyright (C) 2019 Michael Jeanson <mjeanson@efficios.com>
- */
-
-#ifndef _LTTNG_WRAPPER_SYSCALL_H
-#define _LTTNG_WRAPPER_SYSCALL_H
-
-#include <asm/syscall.h>
-#include <lttng-kernel-version.h>
-
-#define LTTNG_SYSCALL_NR_ARGS 6
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0))
-
-#define lttng_syscall_get_arguments(task, regs, args) \
-       syscall_get_arguments(task, regs, args)
-
-#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0) */
-
-static inline
-void lttng_syscall_get_arguments(struct task_struct *task,
-               struct pt_regs *regs, unsigned long *args)
-{
-       syscall_get_arguments(task, regs, 0, LTTNG_SYSCALL_NR_ARGS, args);
-}
-
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0) */
-
-#endif /* _LTTNG_WRAPPER_SYSCALL_H */