From owner-p4-projects@FreeBSD.ORG  Mon Oct  9 11:30:55 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 9440B16A47B; Mon,  9 Oct 2006 11:30:55 +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 5786416A416
	for <perforce@FreeBSD.org>; Mon,  9 Oct 2006 11:30:55 +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 5F78244139
	for <perforce@FreeBSD.org>; Mon,  9 Oct 2006 11:24:18 +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 k99BOHki002780
	for <perforce@FreeBSD.org>; Mon, 9 Oct 2006 11:24:17 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k99BOH7n002774
	for perforce@freebsd.org; Mon, 9 Oct 2006 11:24:17 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Mon, 9 Oct 2006 11:24:17 GMT
Message-Id: <200610091124.k99BOH7n002774@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 107545 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: Mon, 09 Oct 2006 11:30:55 -0000

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

Change 107545 by rdivacky@rdivacky_witten on 2006/10/09 11:24:06

	Use segment 4 instead of 3. This enables amd64 bash to start (ie. its working).

Affected files ...

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

Differences ...

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

@@ -647,13 +647,13 @@
 		 * looks like we're getting the idx we returned
 		 * in the set_thread_area() syscall
 		 */
-		if (idx != 6 && idx != 3)
+		if (idx != 6 && idx != 4)
 			return (EINVAL);
 
 		/* this doesnt happen in practice */
 		if (idx == 6) {
-		   	/* we might copy out the entry_number as 3 */
-		   	info.entry_number = 3;
+		   	/* we might copy out the entry_number as 4 */
+		   	info.entry_number = 4;
 			error = copyout(&info, (void *) td->td_frame->tf_rsi, sizeof(struct l_user_desc));
 			if (error)
 	   		   	return (error);
@@ -1221,10 +1221,10 @@
 
 	/* 
 	 * we support just GLIBC TLS now 
-	 * we should let 3 proceed as well because we use this segment so
+	 * we should let 4 proceed as well because we use this segment so
 	 * if code does two subsequent calls it should succeed
 	 */
-	if (idx != 6 && idx != -1 && idx != 3)
+	if (idx != 6 && idx != -1 && idx != 4)
 		return (EINVAL);
 
 	/* 
@@ -1233,7 +1233,7 @@
 	 * XXX: what if userspace program doesnt check this value and tries
 	 * to use 6, 7 or 8? 
 	 */
-	idx = info.entry_number = 3;
+	idx = info.entry_number = 4;
 	error = copyout(&info, args->desc, sizeof(struct l_user_desc));
 	if (error)
 		return (error);