cff896bf5c
Copy from Base:System/glibc based on submit request 38894 from user pbaudis OBS-URL: https://build.opensuse.org/request/show/38894 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=18
30 lines
903 B
Diff
30 lines
903 B
Diff
Index: glibc-2.11.1/nptl/pthread_cond_timedwait.c
|
|
===================================================================
|
|
--- glibc-2.11.1.old/nptl/pthread_cond_timedwait.c
|
|
+++ glibc-2.11.1/nptl/pthread_cond_timedwait.c
|
|
@@ -27,6 +27,15 @@
|
|
|
|
#include <shlib-compat.h>
|
|
|
|
+#ifndef HAVE_CLOCK_GETTIME_VSYSCALL
|
|
+# undef INTERNAL_VSYSCALL
|
|
+# define INTERNAL_VSYSCALL INTERNAL_SYSCALL
|
|
+# undef INLINE_VSYSCALL
|
|
+# define INLINE_VSYSCALL INLINE_SYSCALL
|
|
+#else
|
|
+# include <bits/libc-vdso.h>
|
|
+#endif
|
|
+
|
|
|
|
/* Cleanup handler, defined in pthread_cond_wait.c. */
|
|
extern void __condvar_cleanup (void *arg)
|
|
@@ -102,7 +111,7 @@ __pthread_cond_timedwait (cond, mutex, a
|
|
#ifdef __NR_clock_gettime
|
|
INTERNAL_SYSCALL_DECL (err);
|
|
int ret;
|
|
- ret = INTERNAL_SYSCALL (clock_gettime, err, 2,
|
|
+ ret = INTERNAL_VSYSCALL (clock_gettime, err, 2,
|
|
(cond->__data.__nwaiters
|
|
& ((1 << COND_NWAITERS_SHIFT) - 1)),
|
|
&rt);
|