From owner-svn-src-all@FreeBSD.ORG  Fri Feb 10 07:03:46 2012
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 401791065673;
	Fri, 10 Feb 2012 07:03:46 +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 2F0A98FC13;
	Fri, 10 Feb 2012 07:03:46 +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 q1A73kCj059035;
	Fri, 10 Feb 2012 07:03:46 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1A73jum059033;
	Fri, 10 Feb 2012 07:03:45 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <201202100703.q1A73jum059033@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Fri, 10 Feb 2012 07:03:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r231351 - head/sys/mips/mips
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: Fri, 10 Feb 2012 07:03:46 -0000

Author: gonzo
Date: Fri Feb 10 07:03:45 2012
New Revision: 231351
URL: http://svn.freebsd.org/changeset/base/231351

Log:
  Fix-up value passed by thr_new syscall to make it compatible
  with MIPS_TLS_GET/MIPS_TLS_SET sysarch API.

Modified:
  head/sys/mips/mips/vm_machdep.c

Modified: head/sys/mips/mips/vm_machdep.c
==============================================================================
--- head/sys/mips/mips/vm_machdep.c	Fri Feb 10 06:53:25 2012	(r231350)
+++ head/sys/mips/mips/vm_machdep.c	Fri Feb 10 07:03:45 2012	(r231351)
@@ -601,7 +601,18 @@ int
 cpu_set_user_tls(struct thread *td, void *tls_base)
 {
 
-	td->td_md.md_tls = tls_base;
+	/* 
+	 * tls_base passed to this function 
+         * from thr_new call and points to actual TCB struct, 
+	 * so we should add TP_OFFSET + sizeof(struct tcb)
+	 * to make it the same way TLS base is passed to 
+	 * MIPS_SET_TLS/MIPS_GET_TLS API 
+	 */
+#ifndef __mips_n64
+	td->td_md.md_tls = (char*)tls_base + 0x7010;
+#else
+	td->td_md.md_tls = (char*)tls_base + 0x7008;
+#endif
 	return (0);
 }