diff options
| author | attilio <attilio@FreeBSD.org> | 2012-09-08 18:29:53 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2012-09-08 18:29:53 +0000 |
| commit | 1e61b37b3fa32dbd38244eaef86701972d1c07fc (patch) | |
| tree | 770f1c244f14a5fbe604cf09e03fe9c3f21cbaba /sys/kern/subr_trap.c | |
| parent | 8dece93b14588b73bf5dec69091706dcdccba2fc (diff) | |
| download | FreeBSD-src-1e61b37b3fa32dbd38244eaef86701972d1c07fc.zip FreeBSD-src-1e61b37b3fa32dbd38244eaef86701972d1c07fc.tar.gz | |
Move PT_UPDATED_FLUSH() before td_locks check in order to have more
coverage also in the XEN case.
Reviewed by: kib
MFC after: 1 week
Diffstat (limited to 'sys/kern/subr_trap.c')
| -rw-r--r-- | sys/kern/subr_trap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index dcba5b8..1dc0b9c09 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -136,6 +136,9 @@ userret(struct thread *td, struct trapframe *frame) * Let the scheduler adjust our priority etc. */ sched_userret(td); +#ifdef XEN + PT_UPDATES_FLUSH(); +#endif KASSERT(td->td_locks == 0, ("userret: Returning with %d locks held.", td->td_locks)); #ifdef VIMAGE @@ -145,9 +148,6 @@ userret(struct thread *td, struct trapframe *frame) __func__, td, p->p_pid, td->td_name, curvnet, (td->td_vnet_lpush != NULL) ? td->td_vnet_lpush : "N/A")); #endif -#ifdef XEN - PT_UPDATES_FLUSH(); -#endif } /* |
