* 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.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 4b5b094..127dfdc 100644 (file)
--- 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 cce512f..3ba647a 100644 (file)
--- 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 731b7be..217ae3f 100644 (file)
--- 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;