From owner-p4-projects@FreeBSD.ORG  Fri Sep 29 13:22:11 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0F89016A416; Fri, 29 Sep 2006 13:22:11 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
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 DEC4016A40F
	for <perforce@FreeBSD.org>; Fri, 29 Sep 2006 13:22:10 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A774B43D45
	for <perforce@FreeBSD.org>; Fri, 29 Sep 2006 13:22:10 +0000 (GMT)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8TDMAGs078019
	for <perforce@FreeBSD.org>; Fri, 29 Sep 2006 13:22:10 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8TDMARu078016
	for perforce@freebsd.org; Fri, 29 Sep 2006 13:22:10 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Fri, 29 Sep 2006 13:22:10 GMT
Message-Id: <200609291322.k8TDMARu078016@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rdivacky@FreeBSD.org using -f
From: Roman Divacky <rdivacky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 106881 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Fri, 29 Sep 2006 13:22:11 -0000

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

Change 106881 by rdivacky@rdivacky_witten on 2006/09/29 13:21:44

	Be sane and set %gs instead of %fs. Still not there but getting closer.

Affected files ...

.. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#5 edit

Differences ...

==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#5 (text+ko) ====

@@ -57,6 +57,7 @@
 
 #include <amd64/linux32/linux.h>
 #include <amd64/linux32/linux32_proto.h>
+#include <amd64/include/specialreg.h>
 #include <compat/linux/linux_ipc.h>
 #include <compat/linux/linux_signal.h>
 #include <compat/linux/linux_util.h>
@@ -679,9 +680,11 @@
 
 		/* this is taken from amd64 version of cpu_set_user_tls() */
 		critical_enter();
-		/* set %fs */
-		td->td_pcb->pcb_fsbase = (register_t)((register_t)sd.sd_hibase << 24 | sd.sd_lobase);
-		wrmsr(MSR_FSBASE, td->td_pcb->pcb_fsbase);
+		/* set %gs */
+		td->td_pcb->pcb_gsbase = (register_t)((register_t)sd.sd_hibase << 24 | sd.sd_lobase);
+#if 0
+		wrmsr(MSR_KGSBASE, td->td_pcb->pcb_fsbase);
+#endif
 		critical_exit();
 	}
 
@@ -1281,9 +1284,9 @@
 
 	/* this is taken from amd64 version of cpu_set_user_tls() */
 	critical_enter();
-	/* set %fs */
-	td->td_pcb->pcb_fsbase = (register_t)((register_t)sd.sd_hibase << 24 | sd.sd_lobase);
-	wrmsr(MSR_FSBASE, td->td_pcb->pcb_fsbase);
+	/* set %gs */
+	td->td_pcb->pcb_gsbase = (register_t)((register_t)sd.sd_hibase << 24 | sd.sd_lobase);
+	wrmsr(MSR_KGSBASE, td->td_pcb->pcb_gsbase);
 
 	critical_exit();