diff options
| author | Gleb Smirnoff <glebius@FreeBSD.org> | 2019-10-24 21:55:19 +0000 |
|---|---|---|
| committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2019-10-24 21:55:19 +0000 |
| commit | ed9d69b5e89bb5b0685b713f6b7d771d332b8cd3 (patch) | |
| tree | 3094e3d82e6f4a6449d294690cabe27ac52c8512 | |
| parent | 1a75045196a26c2dd00a03a3d6d231dd5b422a9b (diff) | |
| download | src-ed9d69b5e89bb5b0685b713f6b7d771d332b8cd3.tar.gz src-ed9d69b5e89bb5b0685b713f6b7d771d332b8cd3.zip | |
Use THREAD_CAN_SLEEP() macro to check if thread can sleep. There is no
functional change.
Discussed with: kib
Notes
Notes:
svn path=/head/; revision=354052
| -rw-r--r-- | sys/kern/subr_sleepqueue.c | 2 | ||||
| -rw-r--r-- | sys/kern/subr_trap.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/subr_sleepqueue.c b/sys/kern/subr_sleepqueue.c index 16e9bbfa3abc..0f52c212ca52 100644 --- a/sys/kern/subr_sleepqueue.c +++ b/sys/kern/subr_sleepqueue.c @@ -315,7 +315,7 @@ sleepq_add(void *wchan, struct lock_object *lock, const char *wmesg, int flags, MPASS((queue >= 0) && (queue < NR_SLEEPQS)); /* If this thread is not allowed to sleep, die a horrible death. */ - KASSERT(td->td_no_sleeping == 0, + KASSERT(THREAD_CAN_SLEEP(), ("%s: td %p to sleep on wchan %p with sleeping prohibited", __func__, td, wchan)); diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 4f9629403f77..88abc78085c4 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -185,7 +185,7 @@ userret(struct thread *td, struct trapframe *frame) td->td_lk_slocks)); KASSERT((td->td_pflags & TDP_NOFAULTING) == 0, ("userret: Returning with pagefaults disabled")); - KASSERT(td->td_no_sleeping == 0, + KASSERT(THREAD_CAN_SLEEP(), ("userret: Returning with sleep disabled")); KASSERT(td->td_pinned == 0 || (td->td_pflags & TDP_CALLCHAIN) != 0, ("userret: Returning with with pinned thread")); |