From owner-svn-src-projects@FreeBSD.ORG  Sat Mar  3 12:41:20 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 452D5106566C;
	Sat,  3 Mar 2012 12:41:20 +0000 (UTC)
	(envelope-from cognet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 34F578FC15;
	Sat,  3 Mar 2012 12:41:20 +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 q23CfJxe082215;
	Sat, 3 Mar 2012 12:41:19 GMT (envelope-from cognet@svn.freebsd.org)
Received: (from cognet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q23CfJYX082213;
	Sat, 3 Mar 2012 12:41:19 GMT (envelope-from cognet@svn.freebsd.org)
Message-Id: <201203031241.q23CfJYX082213@svn.freebsd.org>
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Sat, 3 Mar 2012 12:41:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232458 - projects/armv6/sys/arm/arm
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Mar 2012 12:41:20 -0000

Author: cognet
Date: Sat Mar  3 12:41:19 2012
New Revision: 232458
URL: http://svn.freebsd.org/changeset/base/232458

Log:
  Use set_tls()/get_tls() for >= armv6

Modified:
  projects/armv6/sys/arm/arm/sys_machdep.c

Modified: projects/armv6/sys/arm/arm/sys_machdep.c
==============================================================================
--- projects/armv6/sys/arm/arm/sys_machdep.c	Sat Mar  3 12:27:53 2012	(r232457)
+++ projects/armv6/sys/arm/arm/sys_machdep.c	Sat Mar  3 12:41:19 2012	(r232458)
@@ -90,9 +90,12 @@ arm32_set_tp(struct thread *td, void *ar
 
 	if (td != curthread)
 		td->td_md.md_tp = (register_t)args;
-	else
-		/* XXX: wrong for SMP case */
+	else 
+#ifdef _ARM_ARCH_6
+		set_tls(args);
+#else
 		*(register_t *)ARM_TP_ADDRESS = (register_t)args;
+#endif
 	return (0);
 }
 
@@ -103,8 +106,11 @@ arm32_get_tp(struct thread *td, void *ar
 	if (td != curthread)
 		td->td_retval[0] = td->td_md.md_tp;
 	else
-		/* XXX: wrong for SMP case */
+#ifdef _ARM_ARCH_6
+		td->td_retval[0] = (register_t)get_tls();
+#else
 		td->td_retval[0] = *(register_t *)ARM_TP_ADDRESS;
+#endif
 	return (0);
 }