From owner-p4-projects@FreeBSD.ORG  Sun Jan 21 14:45:24 2007
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 EF3B116A409; Sun, 21 Jan 2007 14:45:23 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C96CB16A405
	for <perforce@FreeBSD.org>; Sun, 21 Jan 2007 14:45:23 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id BAA0213C45B
	for <perforce@FreeBSD.org>; Sun, 21 Jan 2007 14:45:23 +0000 (UTC)
	(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 l0LEjN6p047517
	for <perforce@FreeBSD.org>; Sun, 21 Jan 2007 14:45:23 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LEjNCh047514
	for perforce@freebsd.org; Sun, 21 Jan 2007 14:45:23 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Sun, 21 Jan 2007 14:45:23 GMT
Message-Id: <200701211445.l0LEjNCh047514@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 113253 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: Sun, 21 Jan 2007 14:45:24 -0000

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

Change 113253 by rdivacky@rdivacky_witten on 2007/01/21 14:45:12

	user_desc structure is differnt on amd64 running in i386 mode.
	Sync that.

Affected files ...

.. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#14 edit

Differences ...

==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#14 (text+ko) ====

@@ -768,6 +768,7 @@
 	l_uint		limit_in_pages:1;
 	l_uint		seg_not_present:1;
 	l_uint		useable:1;
+	l_uint		lm:1;
 };
 
 struct l_desc_struct {
@@ -791,6 +792,7 @@
 #define ENTRY_B_USEABLE		20
 #define ENTRY_B_SEG32BIT	22
 #define ENTRY_B_LIMIT		23
+#define ENTRY_B_LONGMODE	21
 
 #define LDT_entry_b(info) \
         (((info)->base_addr & 0xff000000) | \
@@ -811,7 +813,8 @@
         (info)->read_exec_only  == 1    && \
         (info)->seg_32bit       == 0    && \
         (info)->limit_in_pages  == 0    && \
-        (info)->useable         == 0    )
+        (info)->useable         == 0    && \
+        (info)->lm              == 0)
 
 /* macros for converting segments, they do the same as those in arch/i386/kernel/process.c */
 #define GET_BASE(desc) ( \
@@ -829,6 +832,7 @@
 #define GET_LIMIT_PAGES(desc)   (((desc)->b >> ENTRY_B_LIMIT) & 1)
 #define GET_PRESENT(desc)       (((desc)->b >> ENTRY_B_SEG_NOT_PRESENT) & 1)
 #define GET_USEABLE(desc)       (((desc)->b >> ENTRY_B_USEABLE) & 1)
+#define GET_LONGMODE(desc)      (((desc)->b >> ENTRY_B_LONGMODE) & 1)
 
 #define LINUX_CLOCK_REALTIME            0
 #define LINUX_CLOCK_MONOTONIC           1