diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-09-05 12:46:12 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-09-05 12:46:12 -0400 |
| commit | 3b142ce5728f6d683f3375fb33099ebf243f6681 (patch) | |
| tree | 896f73d70426cd798e72bd786c0cb000d55b50ad /nptl | |
| parent | 2f0ad8f3a470fa5e9aeb9c5a41984f96ae58d7ba (diff) | |
| parent | 5f4318d102d604e2f80bc97927e2d80f76063639 (diff) | |
| download | glibc-3b142ce5728f6d683f3375fb33099ebf243f6681.tar.gz glibc-3b142ce5728f6d683f3375fb33099ebf243f6681.tar.xz glibc-3b142ce5728f6d683f3375fb33099ebf243f6681.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/allocatestack.c | 11 |
2 files changed, 15 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 06d19b9411..c44ce2af6f 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2011-08-31 Andreas Schwab <schwab@redhat.com> + + * allocatestack.c (setxid_mark_thread): Ensure that the exiting + thread is woken up. + 2011-08-20 David S. Miller <davem@davemloft.net> * Makefile (tst-cleanup0.out): Fix typo in output redirection. diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c index 9b8b0ceb40..23d2ce559c 100644 --- a/nptl/allocatestack.c +++ b/nptl/allocatestack.c @@ -999,7 +999,16 @@ setxid_mark_thread (struct xid_command *cmdp, struct pthread *t) /* If the thread is exiting right now, ignore it. */ if ((ch & EXITING_BITMASK) != 0) - return; + { + /* Release the futex if there is no other setxid in + progress. */ + if ((ch & SETXID_BITMASK) == 0) + { + t->setxid_futex = 1; + lll_futex_wake (&t->setxid_futex, 1, LLL_PRIVATE); + } + return; + } } while (atomic_compare_and_exchange_bool_acq (&t->cancelhandling, ch | SETXID_BITMASK, ch)); |