diff options
author | Thomas Schwinge <thomas@codesourcery.com> | 2012-08-30 23:31:39 +0200 |
---|---|---|
committer | Thomas Schwinge <thomas@codesourcery.com> | 2012-08-30 23:31:39 +0200 |
commit | 16a92d2765c5732abb64742cb5d387148e0ac629 (patch) | |
tree | abbbadbf54f87eed25f71a312e43ce7f7cb7adfe /sysdeps/generic/pt-rwlock-timedrdlock.c | |
parent | 9a231435f830c459c0e214c2b99877e2ed6edb56 (diff) | |
parent | 0096579c8bea920f7c42b40ea22db621da6480a5 (diff) |
Merge commit 'refs/top-bases/t/fix_inline' into t/fix_inlinet/fix_inline
Conflicts:
sysdeps/l4/hurd/pt-sysdep.h
Diffstat (limited to 'sysdeps/generic/pt-rwlock-timedrdlock.c')
-rw-r--r-- | sysdeps/generic/pt-rwlock-timedrdlock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/generic/pt-rwlock-timedrdlock.c b/sysdeps/generic/pt-rwlock-timedrdlock.c index ba610fa..a110213 100644 --- a/sysdeps/generic/pt-rwlock-timedrdlock.c +++ b/sysdeps/generic/pt-rwlock-timedrdlock.c @@ -73,7 +73,7 @@ __pthread_rwlock_timedrdlock_internal (struct __pthread_rwlock *rwlock, { error_t err; - err = __pthread_timedblock (self, abstime); + err = __pthread_timedblock (self, abstime, CLOCK_REALTIME); if (err) /* We timed out. We may need to disconnect ourself from the waiter queue. |