diff options
| author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2020-09-14 10:17:07 +0000 |
|---|---|---|
| committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2020-09-14 10:17:07 +0000 |
| commit | fecb19e4315ddaddc7554daefcc89a8a718fc0bd (patch) | |
| tree | a3bfbbd944bd8f124524d9d60a48531ea5737ccf | |
| parent | 60f083efe2224acc1c41d541168de8c223766af1 (diff) | |
Notes
| -rw-r--r-- | sys/kern/subr_trap.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index a2ebf992a89dc..3c7e54e3b195a 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -134,9 +134,6 @@ userret(struct thread *td, struct trapframe *frame) KTRUSERRET(td); #endif - td_softdep_cleanup(td); - MPASS(td->td_su == NULL); - /* * Charge system time if profiling. */ @@ -188,8 +185,6 @@ userret(struct thread *td, struct trapframe *frame) ("userret: Returning with preallocated vnode")); KASSERT((td->td_flags & (TDF_SBDRY | TDF_SEINTR | TDF_SERESTART)) == 0, ("userret: Returning with stop signals deferred")); - KASSERT(td->td_su == NULL, - ("userret: Returning with SU cleanup request not handled")); KASSERT(td->td_vslock_sz == 0, ("userret: Returning with vslock-wired space")); #ifdef VIMAGE @@ -279,6 +274,9 @@ ast(struct trapframe *framep) #endif } + td_softdep_cleanup(td); + MPASS(td->td_su == NULL); + /* * If this thread tickled GEOM, we need to wait for the giggling to * stop before we return to userland |