From owner-svn-src-all@FreeBSD.ORG  Sat Sep  8 18:29:53 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CCB24106566B;
	Sat,  8 Sep 2012 18:29:53 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B78CC8FC08;
	Sat,  8 Sep 2012 18:29:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q88ITrtU035500;
	Sat, 8 Sep 2012 18:29:53 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q88ITrk8035498;
	Sat, 8 Sep 2012 18:29:53 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201209081829.q88ITrk8035498@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Sat, 8 Sep 2012 18:29:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240245 - head/sys/kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Sep 2012 18:29:53 -0000

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
 }
 
 /*