timer: Decouple x86_64 specific timer_settime from generic Linux implementation

The x86_64 specific timer_settime implementation (from
./linux/x86_64/timer_settime.c) reused the Linux generic one (from
./linux/timer_settime.c) to implement handling some compatible timers
(previously defined in librt, now in libc).

As the generic implementation now is going to also support new (available
from Linux 5.1+) timer_settime64 syscall, those two implementations have
been decoupled for easier conversion.

The original INLINE_SYSCALL() macro has been replaced with
INLINE_SYSCALL_CALL() to avoid explicit passing the number of arguments.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>

2 files changed, 10 insertions, 11 deletions

diff --git a/sysdeps/unix/sysv/linux/timer_settime.c b/sysdeps/unix/sysv/linux/timer_settime.c
index a8350aedaa..51f24200aa 100644
--- a/sysdeps/unix/sysv/linux/timer_settime.c
+++ b/sysdeps/unix/sysv/linux/timer_settime.c
@@ -22,17 +22,10 @@
 #include <sysdep.h>
 #include "kernel-posix-timers.h"
 
-
-#ifdef timer_settime_alias
-# define timer_settime timer_settime_alias
-#endif
-
-
 int
 timer_settime (timer_t timerid, int flags, const struct itimerspec *value,
 	       struct itimerspec *ovalue)
 {
-#undef timer_settime
   struct timer *kt = (struct timer *) timerid;
 
   /* Delete the kernel timer object.  */
diff --git a/sysdeps/unix/sysv/linux/x86_64/timer_settime.c b/sysdeps/unix/sysv/linux/x86_64/timer_settime.c
index ea8978d5cd..4ed92e9644 100644
--- a/sysdeps/unix/sysv/linux/x86_64/timer_settime.c
+++ b/sysdeps/unix/sysv/linux/x86_64/timer_settime.c
@@ -17,13 +17,19 @@
    not, see <https://www.gnu.org/licenses/>.  */
 
 #include <shlib-compat.h>
+#include <sysdep.h>
+#include "kernel-posix-timers.h"
 #include "compat-timer.h"
 
+int
+__timer_settime_new (timer_t timerid, int flags, const struct itimerspec *value,
+                     struct itimerspec *ovalue)
+{
+  struct timer *kt = (struct timer *) timerid;
 
-#define timer_settime_alias __timer_settime_new
-#include <sysdeps/unix/sysv/linux/timer_settime.c>
-
-#undef timer_settime
+  return INLINE_SYSCALL_CALL (timer_settime, kt->ktimerid, flags, value,
+                              ovalue);
+}
 versioned_symbol (librt, __timer_settime_new, timer_settime, GLIBC_2_3_3);