From owner-svn-src-stable@FreeBSD.ORG  Wed Feb 20 03:59:46 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C0F7B891;
 Wed, 20 Feb 2013 03:59:46 +0000 (UTC)
 (envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B3B42E08;
 Wed, 20 Feb 2013 03:59:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1K3xkft013606;
 Wed, 20 Feb 2013 03:59:46 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1K3xkCF013605;
 Wed, 20 Feb 2013 03:59:46 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201302200359.r1K3xkCF013605@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Wed, 20 Feb 2013 03:59:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r247018 - stable/9/sys/ia64/ia64
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Wed, 20 Feb 2013 03:59:46 -0000

Author: marcel
Date: Wed Feb 20 03:59:45 2013
New Revision: 247018
URL: http://svnweb.freebsd.org/changeset/base/247018

Log:
  MFC r246890:
  Close a race relating to setting the PCPU pointer (r13).

Modified:
  stable/9/sys/ia64/ia64/syscall.S
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/ia64/ia64/syscall.S
==============================================================================
--- stable/9/sys/ia64/ia64/syscall.S	Wed Feb 20 02:40:03 2013	(r247017)
+++ stable/9/sys/ia64/ia64/syscall.S	Wed Feb 20 03:59:45 2013	(r247018)
@@ -228,7 +228,7 @@ ENTRY_NOPROFILE(epc_syscall, 8)
 {	.mmi
 	mov		r16=ar.rsc
 	mov		ar.rsc=0
-	mov		r17=r13
+	nop		0
 	;;
 }
 {	.mmi
@@ -239,13 +239,13 @@ ENTRY_NOPROFILE(epc_syscall, 8)
 	;;
 }
 {	.mmi
-	mov		r13=ar.k4
+	mov		r21=ar.unat
 	add		r30=-SIZEOF_TRAPFRAME,r14
 	mov		r20=sp
 	;;
 }
 {	.mii
-	mov		r21=ar.unat
+	mov		r17=r13
 	dep		r30=0,r30,0,10
 	;;
 	add		sp=-16,r30
@@ -258,10 +258,10 @@ ENTRY_NOPROFILE(epc_syscall, 8)
 	add		r31=8,r30
 	;;
 }
-{	.mii
+{	.mmi
+	mov		r13=ar.k4
 	mov		r22=ar.fpsr
 	sub		r29=r14,r30
-	nop		0
 }
 {	.mmi
 	mov		r23=ar.bsp