From owner-p4-projects@FreeBSD.ORG  Sat Nov  6 00:37:54 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0D28F16A4D1; Sat,  6 Nov 2004 00:37:54 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DB4DA16A4CE
	for <perforce@freebsd.org>; Sat,  6 Nov 2004 00:37:53 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CD71A43D3F
	for <perforce@freebsd.org>; Sat,  6 Nov 2004 00:37:53 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA60brtG043662
	for <perforce@freebsd.org>; Sat, 6 Nov 2004 00:37:53 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA60brbb043659
	for perforce@freebsd.org; Sat, 6 Nov 2004 00:37:53 GMT
	(envelope-from peter@freebsd.org)
Date: Sat, 6 Nov 2004 00:37:53 GMT
Message-Id: <200411060037.iA60brbb043659@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 64394 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Nov 2004 00:37:54 -0000

http://perforce.freebsd.org/chv.cgi?CH=64394

Change 64394 by peter@peter_daintree on 2004/11/06 00:37:41

	invade libthr

Affected files ...

.. //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#14 edit

Differences ...

==== //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#14 (text+ko) ====

@@ -62,14 +62,21 @@
 void *
 _set_curthread(ucontext_t *uc, struct pthread *thr, int *err)
 {
+#ifndef COMPAT_32BIT
 	union descriptor desc;
+#endif
 	struct tcb *tcb;
 	void *oldtls;
+#ifndef COMPAT_32BIT
 	int ldt_index;
+#endif
 
 	*err = 0;
 
 	if (uc == NULL && thr->arch_id != NULL) {
+#ifndef COMPAT_32BIT
+		 _amd64_set_gsbase(thr->arch_id);
+#endif
 		return (thr->arch_id);
 	}
 
@@ -91,6 +98,7 @@
 	 */
 	tcb->tcb_thread = thr;
 
+#ifndef COMPAT_32BIT
 	bzero(&desc, sizeof(desc));
 
 	/*
@@ -119,6 +127,10 @@
 		uc->uc_mcontext.mc_gs = LSEL(ldt_index, SEL_UPL);
 	else
 		_set_gs(LSEL(ldt_index, SEL_UPL));
+#else
+	if (uc == NULL)
+		_amd64_set_gsbase(tcb);
+#endif
 
 	return (tcb);
 }