26c26
< * $FreeBSD: head/lib/libthr/thread/thr_join.c 164715 2006-11-28 11:05:31Z davidxu $
---
> * $FreeBSD: head/lib/libthr/thread/thr_join.c 211524 2010-08-20 05:15:39Z davidxu $
70a71,74
> /*
> * Cancellation behavior:
> * if the thread is canceled, joinee is not recycled.
> */
106c110
< _thr_cancel_enter(curthread);
---
> _thr_cancel_enter_defer(curthread, 1);
109a114
> _thr_testcancel(curthread);
125c130
< _thr_cancel_leave(curthread);
---
> _thr_cancel_leave_defer(curthread, 0);