From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 97280 invoked by alias); 31 Oct 2019 14:12:17 -0000 Mailing-List: contact glibc-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: glibc-cvs-owner@sourceware.org List-Subscribe: Received: (qmail 97262 invoked by uid 9943); 31 Oct 2019 14:12:17 -0000 Date: Thu, 31 Oct 2019 14:12:00 -0000 Message-ID: <20191031141217.97261.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] Refactor adjtimex based on clock_adjtime X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/master X-Git-Oldrev: 6b1472eb2ea16f99c4729f975ca25af980ce3894 X-Git-Newrev: c81aa64e81826c308c4ecbd1982fa086ca6e647b X-SW-Source: 2019-q4/txt/msg00224.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c81aa64e81826c308c4ecbd1982fa086ca6e647b commit c81aa64e81826c308c4ecbd1982fa086ca6e647b Author: Adhemerval Zanella Date: Mon Oct 28 14:55:22 2019 -0300 Refactor adjtimex based on clock_adjtime Checked on x86_64-linux-gnu. Reviewed-by: Florian Weimer Diff: --- include/time.h | 5 +++++ sysdeps/unix/sysv/linux/adjtimex.c | 2 +- sysdeps/unix/sysv/linux/syscalls.list | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/time.h b/include/time.h index caf562a..000672e 100644 --- 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 6d62c72..95be503 100644 --- 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 70b1109..603e517 100644 --- 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