From 8056ea641faa89225cffcf8507cd20de95b8b6ae Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 15 Nov 2011 07:31:33 -0500 Subject: [PATCH] Fix Linux SYSDEP_GETTIME_CPU for newer kernels --- ChangeLog | 6 ++++++ sysdeps/unix/sysv/linux/clock_gettime.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8bb25138ca..1c9002eb29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-11-15 Ulrich Drepper + + * sysdeps/unix/sysv/linux/clock_gettime.c (SYSDEP_GETTIME_CPU): If + __ASSUME_POSIX_CPU_TIMERS is defined assign the result of the syscall + to retval and return. + 2011-11-15 Andreas Schwab * sysdeps/unix/sysv/linux/check_pf.c (make_request): Properly diff --git a/sysdeps/unix/sysv/linux/clock_gettime.c b/sysdeps/unix/sysv/linux/clock_gettime.c index e5e032d98b..0d7e027055 100644 --- a/sysdeps/unix/sysv/linux/clock_gettime.c +++ b/sysdeps/unix/sysv/linux/clock_gettime.c @@ -110,7 +110,8 @@ maybe_syscall_gettime (clockid_t clock_id, struct timespec *tp) # if __ASSUME_POSIX_CPU_TIMERS > 0 -# define SYSDEP_GETTIME_CPU SYSCALL_GETTIME +# define SYSDEP_GETTIME_CPU(clock_id, tp) \ + retval = SYSCALL_GETTIME (clock_id, tp); break # define SYSDEP_GETTIME_CPUTIME /* Default catches them too. */ # else