Refactor adjtimex based on clock_adjtime

Checked on x86_64-linux-gnu.

Reviewed-by: Florian Weimer <fweimer@redhat.com>

diff --git a/include/time.h b/include/time.h
index caf562a3807a65dbc00d088fd5c17f0974aa4bd8..000672e3bcceed0e41ed1de797bdd4d3b3fa0c99 100644 (file)
--- a/include/time.h
+++ b/include/time.h
@@ -25,6 +25,11 @@ libc_hidden_proto (__clock_gettime)
 extern __typeof (clock_settime) __clock_settime;
 libc_hidden_proto (__clock_settime)
 
+#ifdef __linux__
+extern __typeof (clock_adjtime) __clock_adjtime;
+libc_hidden_proto (__clock_adjtime);
+#endif
+
 /* Now define the internal interfaces.  */
 struct tm;
 

diff --git a/sysdeps/unix/sysv/linux/adjtimex.c b/sysdeps/unix/sysv/linux/adjtimex.c
index 6d62c72a17213f0297c840cca9e7f86e2dd73187..95be5031096761a80ce91c279f8a405a076378b0 100644 (file)
--- a/sysdeps/unix/sysv/linux/adjtimex.c
+++ b/sysdeps/unix/sysv/linux/adjtimex.c
@@ -22,7 +22,7 @@
 int
 ___adjtimex (struct timex *buf)
 {
-  return INLINE_SYSCALL_CALL (adjtimex, buf);
+  return __clock_adjtime (CLOCK_REALTIME, buf);
 }
 
 #ifdef VERSION_adjtimex

diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index 70b110979ba844839e55cecf856452ee988acb67..603e517ca6ab09e8a08431007b100e1b87ce2f43 100644 (file)
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -4,7 +4,7 @@ alarm           -       alarm           i:i     alarm
 bdflush                EXTRA   bdflush         i:ii    __compat_bdflush        bdflush@GLIBC_2.0:GLIBC_2.23
 capget         EXTRA   capget          i:pp    capget
 capset         EXTRA   capset          i:pp    capset
-clock_adjtime  EXTRA   clock_adjtime   i:ip    clock_adjtime
+clock_adjtime  EXTRA   clock_adjtime   i:ip    __clock_adjtime         clock_adjtime
 create_module  EXTRA   create_module   3       __compat_create_module  create_module@GLIBC_2.0:GLIBC_2.23
 delete_module  EXTRA   delete_module   3       delete_module
 epoll_create   EXTRA   epoll_create    i:i     epoll_create