From owner-svn-src-head@FreeBSD.ORG  Fri Dec 31 17:42:26 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 081AC10656A6;
	Fri, 31 Dec 2010 17:42:26 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EAE5C8FC1A;
	Fri, 31 Dec 2010 17:42:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBVHgPKo083696;
	Fri, 31 Dec 2010 17:42:25 GMT
	(envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBVHgP8h083693;
	Fri, 31 Dec 2010 17:42:25 GMT
	(envelope-from cperciva@svn.freebsd.org)
Message-Id: <201012311742.oBVHgP8h083693@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Fri, 31 Dec 2010 17:42:25 +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: r216847 - in head/sys/i386: i386 include
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Dec 2010 17:42:26 -0000

Author: cperciva
Date: Fri Dec 31 17:42:25 2010
New Revision: 216847
URL: http://svn.freebsd.org/changeset/base/216847

Log:
  Make i386_set_ldt work on i386/XEN, step 5/5.
  
  When cleaning up a thread, reset its LDT to the default LDT.
  
  Note: Casting the LDT pointer to an int and storing it in pc_currentldt is
  wildly bogus, but is harmless since pc_currentldt is a write-only variable.
  
  MFC after:	3 days

Modified:
  head/sys/i386/i386/sys_machdep.c
  head/sys/i386/include/segments.h

Modified: head/sys/i386/i386/sys_machdep.c
==============================================================================
--- head/sys/i386/i386/sys_machdep.c	Fri Dec 31 17:41:14 2010	(r216846)
+++ head/sys/i386/i386/sys_machdep.c	Fri Dec 31 17:42:25 2010	(r216847)
@@ -523,8 +523,13 @@ user_ldt_free(struct thread *td)
 	}
 
 	if (td == PCPU_GET(curthread)) {
+#ifdef XEN
+		i386_reset_ldt(&default_proc_ldt);
+		PCPU_SET(currentldt, (int)&default_proc_ldt);
+#else
 		lldt(_default_ldt);
 		PCPU_SET(currentldt, _default_ldt);
+#endif
 	}
 
 	mdp->md_ldt = NULL;

Modified: head/sys/i386/include/segments.h
==============================================================================
--- head/sys/i386/include/segments.h	Fri Dec 31 17:41:14 2010	(r216846)
+++ head/sys/i386/include/segments.h	Fri Dec 31 17:42:25 2010	(r216847)
@@ -257,6 +257,7 @@ struct region_descriptor {
 #ifdef _KERNEL
 extern int	_default_ldt;
 #ifdef XEN
+extern struct proc_ldt default_proc_ldt;
 extern union descriptor *gdt;
 extern union descriptor *ldt;
 #else