2.3.90-38

This commit is contained in:
Jakub Jelinek 2006-02-17 17:21:19 +00:00
parent 4779efd52d
commit 7bf905942e
2 changed files with 7 additions and 3 deletions

View File

@ -1540,7 +1540,7 @@
+ if (atomic_compare_and_exchange_bool_acq (__futex, id, 0) != 0) \ + if (atomic_compare_and_exchange_bool_acq (__futex, id, 0) != 0) \
+ __val = __lll_robust_lock_wait (__futex); \ + __val = __lll_robust_lock_wait (__futex); \
+ __val; \ + __val; \
+ })) + })
+#define lll_robust_mutex_lock(futex, id) __lll_robust_mutex_lock (&(futex), id) +#define lll_robust_mutex_lock(futex, id) __lll_robust_mutex_lock (&(futex), id)
+ +
+ +
@ -1560,7 +1560,7 @@
+ if (atomic_compare_and_exchange_bool_acq (__futex, __id, 0) != 0) \ + if (atomic_compare_and_exchange_bool_acq (__futex, __id, 0) != 0) \
+ __val = __lll_robust_lock_wait (__futex); \ + __val = __lll_robust_lock_wait (__futex); \
+ __val; \ + __val; \
+ })) + })
+#define lll_robust_mutex_cond_lock(futex, id) \ +#define lll_robust_mutex_cond_lock(futex, id) \
+ __lll_robust_mutex_cond_lock (&(futex), id) + __lll_robust_mutex_cond_lock (&(futex), id)
+ +
@ -1584,7 +1584,7 @@
+ if (atomic_compare_and_exchange_bool_acq (__futex, id, 0) != 0) \ + if (atomic_compare_and_exchange_bool_acq (__futex, id, 0) != 0) \
+ __val = __lll_robust_timedlock_wait (__futex, abstime); \ + __val = __lll_robust_timedlock_wait (__futex, abstime); \
+ __val; \ + __val; \
+ })) + })
+#define lll_robust_mutex_timedlock(futex, abstime, id) \ +#define lll_robust_mutex_timedlock(futex, abstime, id) \
+ __lll_robust_mutex_timedlock (&(futex), abstime, id) + __lll_robust_mutex_timedlock (&(futex), abstime, id)
+ +

View File

@ -631,6 +631,10 @@ cat > override_headers/asm/unistd.h <<EOF
#undef __NR_newfstatat #undef __NR_newfstatat
#undef __NR_fstatat64 #undef __NR_fstatat64
%endif %endif
%ifarch s390 s390x
/* FIXME: Handle pselect6 on s390/s390x. */
#undef __NR_pselect6
%endif
#endif #endif
EOF EOF
cat > override_headers/asm/errno.h <<EOF cat > override_headers/asm/errno.h <<EOF