From owner-svn-src-stable@FreeBSD.ORG  Thu Apr 26 13:56:38 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E07B0106566B;
	Thu, 26 Apr 2012 13:56:38 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C9FBE8FC1A;
	Thu, 26 Apr 2012 13:56:38 +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 q3QDucJi051612;
	Thu, 26 Apr 2012 13:56:38 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3QDuc1b051609;
	Thu, 26 Apr 2012 13:56:38 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201204261356.q3QDuc1b051609@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Thu, 26 Apr 2012 13:56:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234704 - stable/9/sys/powerpc/aim
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2012 13:56:39 -0000

Author: nwhitehorn
Date: Thu Apr 26 13:56:38 2012
New Revision: 234704
URL: http://svn.freebsd.org/changeset/base/234704

Log:
  MFC r234517:
  Make sure all pending operations have completed on the existing thread
  before (potentially) migrating it to a different CPU.

Modified:
  stable/9/sys/powerpc/aim/swtch32.S
  stable/9/sys/powerpc/aim/swtch64.S
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/powerpc/aim/swtch32.S
==============================================================================
--- stable/9/sys/powerpc/aim/swtch32.S	Thu Apr 26 13:55:15 2012	(r234703)
+++ stable/9/sys/powerpc/aim/swtch32.S	Thu Apr 26 13:56:38 2012	(r234704)
@@ -113,6 +113,7 @@ ENTRY(cpu_switch)
 	mr	%r3,%r14		/* restore old thread ptr */
 	bl	pmap_deactivate		/* Deactivate the current pmap */
 
+	sync				/* Make sure all of that finished */
 	stw	%r16,TD_LOCK(%r14)	/* ULE:	update old thread's lock */
 
 cpu_switchin:

Modified: stable/9/sys/powerpc/aim/swtch64.S
==============================================================================
--- stable/9/sys/powerpc/aim/swtch64.S	Thu Apr 26 13:55:15 2012	(r234703)
+++ stable/9/sys/powerpc/aim/swtch64.S	Thu Apr 26 13:56:38 2012	(r234704)
@@ -139,6 +139,7 @@ ENTRY(cpu_switch)
 
 	addi	%r1,%r1,48
 
+	sync				/* Make sure all of that finished */
 	std	%r16,TD_LOCK(%r14)	/* ULE:	update old thread's lock */
 
 cpu_switchin: