diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2020-02-14 19:32:58 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2020-02-14 19:32:58 +0000 |
| commit | 74dc6beb30dcb5c57134d6b66e14937b42f911c0 (patch) | |
| tree | 8d43c0abbaf8342857f972872c1f118298e3609e /lib | |
| parent | bc7d20c424ee40e2572225615a92e0054b1dda6e (diff) | |
| parent | 6ed30ea4c0fcb366adedaee7f3c55620cd095c68 (diff) | |
| download | src-74dc6beb30dcb5c57134d6b66e14937b42f911c0.tar.gz src-74dc6beb30dcb5c57134d6b66e14937b42f911c0.zip | |
Merge ^/head r357855 through r357920.
Notes
Notes:
svn path=/projects/clang1000-import/; revision=357930
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libthr/thread/thr_cancel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c index 4194fe180565..7e78fe9163c7 100644 --- a/lib/libthr/thread/thr_cancel.c +++ b/lib/libthr/thread/thr_cancel.c @@ -71,7 +71,7 @@ _thr_cancel(pthread_t pthread) * _thr_find_thread and THR_THREAD_UNLOCK will enter and leave critical * region automatically. */ - if ((ret = _thr_find_thread(curthread, pthread, 0)) == 0) { + if ((ret = _thr_find_thread(curthread, pthread, 1)) == 0) { if (!pthread->cancel_pending) { pthread->cancel_pending = 1; if (pthread->state != PS_DEAD) |