This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.14-529-g116415f
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 15 Nov 2011 18:29:31 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.14-529-g116415f
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 116415f80eeb88e1973a160b8a2ee707d24481b4 (commit)
via 8056ea641faa89225cffcf8507cd20de95b8b6ae (commit)
from 446514f97eaf555200f9ec4f369223f984e638a5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=116415f80eeb88e1973a160b8a2ee707d24481b4
commit 116415f80eeb88e1973a160b8a2ee707d24481b4
Merge: 8056ea6 446514f
Author: Ulrich Drepper <drepper@gmail.com>
Date: Tue Nov 15 13:29:11 2011 -0500
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
sysdeps/unix/sysv/linux/clock_gettime.c
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8056ea641faa89225cffcf8507cd20de95b8b6ae
commit 8056ea641faa89225cffcf8507cd20de95b8b6ae
Author: Ulrich Drepper <drepper@gmail.com>
Date: Tue Nov 15 07:31:33 2011 -0500
Fix Linux SYSDEP_GETTIME_CPU for newer kernels
diff --git a/ChangeLog b/ChangeLog
index 8bb2513..1c9002e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-15 Ulrich Drepper <drepper@gmail.com>
+
+ * 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 <schwab@redhat.com>
* 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 e5e032d..0d7e027 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
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
GNU C Library master sources