diff options
| author | jhb <jhb@FreeBSD.org> | 2013-03-01 22:03:31 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2013-03-01 22:03:31 +0000 |
| commit | 8857575b13cf118cc89efb1b462dd314df09c180 (patch) | |
| tree | 5508497f5efa7add0b4f3b7a364b4d8c9bab98be /sys/kern/subr_trap.c | |
| parent | 0542e230f823d21b65362dd6575a212e82d79bf5 (diff) | |
| download | FreeBSD-src-8857575b13cf118cc89efb1b462dd314df09c180.zip FreeBSD-src-8857575b13cf118cc89efb1b462dd314df09c180.tar.gz | |
Replace the TDP_NOSLEEPING flag with a counter so that the
THREAD_NO_SLEEPING() and THREAD_SLEEPING_OK() macros can nest.
Reviewed by: attilio
Diffstat (limited to 'sys/kern/subr_trap.c')
| -rw-r--r-- | sys/kern/subr_trap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index bd06f20..1f24e88 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -158,7 +158,7 @@ userret(struct thread *td, struct trapframe *frame) ("userret: Returning with %d locks held", td->td_locks)); KASSERT((td->td_pflags & TDP_NOFAULTING) == 0, ("userret: Returning with pagefaults disabled")); - KASSERT((td->td_pflags & TDP_NOSLEEPING) == 0, + KASSERT(td->td_no_sleeping == 0, ("userret: Returning with sleep disabled")); KASSERT(td->td_pinned == 0 || (td->td_pflags & TDP_CALLCHAIN) != 0, ("userret: Returning with with pinned thread")); |
