From owner-svn-src-projects@FreeBSD.ORG  Sat Mar  3 06:38:08 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 81FF4106564A;
	Sat,  3 Mar 2012 06:38:08 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 720B78FC17;
	Sat,  3 Mar 2012 06:38:08 +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 q236c8Xu067604;
	Sat, 3 Mar 2012 06:38:08 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q236c8gF067602;
	Sat, 3 Mar 2012 06:38:08 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <201203030638.q236c8gF067602@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Sat, 3 Mar 2012 06:38:08 +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: r232441 - 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 06:38:08 -0000

Author: gonzo
Date: Sat Mar  3 06:38:07 2012
New Revision: 232441
URL: http://svn.freebsd.org/changeset/base/232441

Log:
  Use proper TLS location if td == curthread

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 06:23:26 2012	(r232440)
+++ projects/armv6/sys/arm/arm/sys_machdep.c	Sat Mar  3 06:38:07 2012	(r232441)
@@ -88,7 +88,11 @@ static int
 arm32_set_tp(struct thread *td, void *args)
 {
 
-	td->td_md.md_tp = (register_t)args;
+	if (td != curthread)
+		td->td_md.md_tp = (register_t)args;
+	else
+		/* XXX: wrong for SMP case */
+		*(register_t *)ARM_TP_ADDRESS = (register_t)args;
 	return (0);
 }
 
@@ -96,7 +100,11 @@ static int
 arm32_get_tp(struct thread *td, void *args)
 {
 
-	td->td_retval[0] = td->td_md.md_tp;
+	if (td != curthread)
+		td->td_retval[0] = td->td_md.md_tp;
+	else
+		/* XXX: wrong for SMP case */
+		td->td_retval[0] = *(register_t *)ARM_TP_ADDRESS;
 	return (0);
 }