diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-11-15 13:29:11 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-11-15 13:29:11 -0500 |
| commit | 116415f80eeb88e1973a160b8a2ee707d24481b4 (patch) | |
| tree | 2dd24107d610a0bdff14fc01a0ded3ffb0b7adf9 /ChangeLog | |
| parent | 8056ea641faa89225cffcf8507cd20de95b8b6ae (diff) | |
| parent | 446514f97eaf555200f9ec4f369223f984e638a5 (diff) | |
| download | glibc-116415f80eeb88e1973a160b8a2ee707d24481b4.tar.gz glibc-116415f80eeb88e1973a160b8a2ee707d24481b4.tar.xz glibc-116415f80eeb88e1973a160b8a2ee707d24481b4.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: sysdeps/unix/sysv/linux/clock_gettime.c
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 1c9002eb29..84cd7004a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. |