about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2011-11-15 15:04:26 +0100
committerAndreas Schwab <schwab@redhat.com>2011-11-15 15:17:15 +0100
commit446514f97eaf555200f9ec4f369223f984e638a5 (patch)
tree2dd24107d610a0bdff14fc01a0ded3ffb0b7adf9
parenta501a01e069619676990454abd43c4d2bf4527f4 (diff)
downloadglibc-446514f97eaf555200f9ec4f369223f984e638a5.tar.gz
glibc-446514f97eaf555200f9ec4f369223f984e638a5.tar.xz
glibc-446514f97eaf555200f9ec4f369223f984e638a5.zip
Fix clock_gettime for assumed kernel >= 2.6.12
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/clock_gettime.c4
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/clock_gettime.c8
3 files changed, 15 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8bb25138ca..84cd7004a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-11-15  Andreas Schwab  <schwab@redhat.com>
 
+	* sysdeps/unix/sysv/linux/clock_gettime.c (SYSDEP_GETTIME_CPU)
+	[__ASSUME_POSIX_CPU_TIMERS > 0]: Assign to retval and break.
+	* sysdeps/unix/sysv/linux/x86_64/clock_gettime.c
+	(SYSCALL_GETTIME): Set errno on error.
+
 	* sysdeps/unix/sysv/linux/check_pf.c (make_request): Properly
 	count references to noai6ai_cached.
 
diff --git a/sysdeps/unix/sysv/linux/clock_gettime.c b/sysdeps/unix/sysv/linux/clock_gettime.c
index e5e032d98b..ad0fe1e8b5 100644
--- a/sysdeps/unix/sysv/linux/clock_gettime.c
+++ b/sysdeps/unix/sysv/linux/clock_gettime.c
@@ -110,7 +110,9 @@ 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
diff --git a/sysdeps/unix/sysv/linux/x86_64/clock_gettime.c b/sysdeps/unix/sysv/linux/x86_64/clock_gettime.c
index 7802701e22..f7121106bc 100644
--- a/sysdeps/unix/sysv/linux/x86_64/clock_gettime.c
+++ b/sysdeps/unix/sysv/linux/x86_64/clock_gettime.c
@@ -3,8 +3,14 @@
 #ifdef SHARED
 # define SYSCALL_GETTIME(id, tp) \
   ({ long int (*f) (clockid_t, struct timespec *) = __vdso_clock_gettime; \
+  long int v_ret;							  \
   PTR_DEMANGLE (f);							  \
-  f (id, tp); })
+  v_ret = f (id, tp);							  \
+  if (INTERNAL_SYSCALL_ERROR_P (v_ret, )) {				  \
+    __set_errno (INTERNAL_SYSCALL_ERRNO (v_ret, ));			  \
+    v_ret = -1;								  \
+  }									  \
+  v_ret; })
 # define INTERNAL_GETTIME(id, tp) \
   ({ long int (*f) (clockid_t, struct timespec *) = __vdso_clock_gettime; \
   PTR_DEMANGLE (f);							  \