From owner-svn-src-all@FreeBSD.ORG  Sat Nov 19 13:03:59 2011
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 A78B1106564A;
	Sat, 19 Nov 2011 13:03:59 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 965748FC13;
	Sat, 19 Nov 2011 13:03:59 +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 pAJD3xBI044140;
	Sat, 19 Nov 2011 13:03:59 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAJD3xtR044138;
	Sat, 19 Nov 2011 13:03:59 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201111191303.pAJD3xtR044138@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 19 Nov 2011 13:03:59 +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: r227714 - stable/9/sys/sparc64/include
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, 19 Nov 2011 13:03:59 -0000

Author: marius
Date: Sat Nov 19 13:03:59 2011
New Revision: 227714
URL: http://svn.freebsd.org/changeset/base/227714

Log:
  MFC: r227539
  
  Define curthread as an inline function that loads the thread pointer
  directly from g7, the pcpu pointer. This guarantees correct behavior
  when the thread migrates to a different CPU.
  Commit message stolen from r205431. Additional testing by Peter Jeremy.
  
  Approved by:	re (kib)

Modified:
  stable/9/sys/sparc64/include/pcpu.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/sparc64/include/pcpu.h
==============================================================================
--- stable/9/sys/sparc64/include/pcpu.h	Sat Nov 19 13:03:14 2011	(r227713)
+++ stable/9/sys/sparc64/include/pcpu.h	Sat Nov 19 13:03:59 2011	(r227714)
@@ -74,6 +74,16 @@ register struct pcpu *pcpup __asm__(__XS
 
 #define	PCPU_GET(member)	(pcpup->pc_ ## member)
 
+static __inline __pure2 struct thread *
+__curthread(void)
+{
+	struct thread *td;
+
+	__asm("ldx [%" __XSTRING(PCPU_REG) "], %0" : "=r" (td));
+	return (td);
+}
+#define	curthread	(__curthread())
+
 /*
  * XXX The implementation of this operation should be made atomic
  * with respect to preemption.