summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-08-15 13:41:04 +0000
committerUlrich Drepper <drepper@redhat.com>2006-08-15 13:41:04 +0000
commit89c85f87eafb471f9e8cb9f27cdd7166ca7bd0b4 (patch)
treec122eb23cd12e0a00ad43507c33c7fb5b577512b
parentad2a3c0750f79662d03a870bdd06e71f4a0aeca9 (diff)
* sysdeps/unix/sysv/linux/clock_settime.c (INTERNAL_VSYSCALL): Usecvs/fedora-glibc-20060815T2033
HAVE_CLOCK_GETRES_VSYSCALL as guard macro rather than HAVE_CLOCK_GETTIME_VSYSCALL. (maybe_syscall_settime_cpu): Use plain INTERNAL_VSYSCALL here.
-rw-r--r--nptl/ChangeLog7
-rw-r--r--nptl/Makefile4
-rw-r--r--sysdeps/unix/sysv/linux/clock_settime.c4
3 files changed, 11 insertions, 4 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 4b5b094091..127dfdc77b 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-15 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/unix/sysv/linux/clock_settime.c (INTERNAL_VSYSCALL): Use
+ HAVE_CLOCK_GETRES_VSYSCALL as guard macro rather than
+ HAVE_CLOCK_GETTIME_VSYSCALL.
+ (maybe_syscall_settime_cpu): Use plain INTERNAL_VSYSCALL here.
+
2006-08-14 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/bits/posix_opt.h
diff --git a/nptl/Makefile b/nptl/Makefile
index cce512f33b..3ba647ab70 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -122,7 +122,7 @@ libpthread-routines = init vars events version \
pthread_mutexattr_getprotocol \
pthread_mutexattr_setprotocol \
pthread_mutexattr_getprioceiling \
- pthread_mutexattr_setprioceiling \
+ pthread_mutexattr_setprioceiling tpp \
pthread_mutex_getprioceiling pthread_mutex_setprioceiling
# pthread_setuid pthread_seteuid pthread_setreuid \
# pthread_setresuid \
@@ -258,7 +258,7 @@ tests = tst-typesizes \
tst-vfork1 tst-vfork2 tst-vfork1x tst-vfork2x \
tst-getpid1 tst-getpid2 tst-getpid3 \
tst-initializers1 $(patsubst %,tst-initializers1-%,c89 gnu89 c99 gnu99)
-xtests = tst-setuid1 tst-setuid1-static
+xtests = tst-setuid1 tst-setuid1-static tst-mutexpp1 tst-mutexpp6 tst-mutexpp10
# Files which must not be linked with libpthread.
tests-nolibpthread = tst-unload
diff --git a/sysdeps/unix/sysv/linux/clock_settime.c b/sysdeps/unix/sysv/linux/clock_settime.c
index 731b7be7b8..217ae3f29b 100644
--- a/sysdeps/unix/sysv/linux/clock_settime.c
+++ b/sysdeps/unix/sysv/linux/clock_settime.c
@@ -22,7 +22,7 @@
#include "kernel-posix-cpu-timers.h"
#include <kernel-features.h>
-#ifndef HAVE_CLOCK_GETTIME_VSYSCALL
+#ifndef HAVE_CLOCK_GETRES_VSYSCALL
# undef INTERNAL_VSYSCALL
# define INTERNAL_VSYSCALL INTERNAL_SYSCALL
# undef INLINE_VSYSCALL
@@ -43,7 +43,7 @@ maybe_syscall_settime_cpu (clockid_t clock_id, const struct timespec *tp)
if (!__libc_missing_posix_cpu_timers)
{
INTERNAL_SYSCALL_DECL (err);
- int r = INTERNAL_VSYSCALL (clock_settime, err, 2, clock_id, tp);
+ int r = INTERNAL_SYSCALL (clock_settime, err, 2, clock_id, tp);
if (!INTERNAL_SYSCALL_ERROR_P (r, err))
return 0;