svn commit: r240245 - head/sys/kern
Attilio Rao
attilio at FreeBSD.org
Sat Sep 8 18:29:53 UTC 2012
Author: attilio
Date: Sat Sep 8 18:29:53 2012
New Revision: 240245
URL: http://svn.freebsd.org/changeset/base/240245
Log:
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
Modified:
head/sys/kern/subr_trap.c
Modified: head/sys/kern/subr_trap.c
==============================================================================
--- head/sys/kern/subr_trap.c Sat Sep 8 18:27:11 2012 (r240244)
+++ head/sys/kern/subr_trap.c Sat Sep 8 18:29:53 2012 (r240245)
@@ -136,6 +136,9 @@ userret(struct thread *td, struct trapfr
* 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 trapfr
__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
}
/*
More information about the svn-src-all
mailing list