mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-12-27 04:41:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://sourceware.org/git/glibc

Browse Source 
Conflicts:
	sysdeps/unix/sysv/linux/clock_gettime.c
This commit is contained in:
Ulrich Drepper 2011-11-15 13:29:11 -05:00
commit 116415f80e
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,11 +1,10 @@
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/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.

3
sysdeps/unix/sysv/linux/clock_gettime.c
View File

@ -111,7 +111,8 @@ maybe_syscall_gettime (clockid_t clock_id, struct timespec *tp)
# if __ASSUME_POSIX_CPU_TIMERS > 0
# define SYSDEP_GETTIME_CPU(clock_id, tp) \
retval = SYSCALL_GETTIME (clock_id, tp); break
retval = SYSCALL_GETTIME (clock_id, tp); \
break
# define SYSDEP_GETTIME_CPUTIME /* Default catches them too. */
# else

8
sysdeps/unix/sysv/linux/x86_64/clock_gettime.c
View File

@ -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); \