X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/4452a7af2eac33dbad800bcc91f2399d62c18f53..4d15aeb193b2c68f1d38666c317f8d3734f5f083:/osfmk/i386/ldt.c?ds=sidebyside

diff --git a/osfmk/i386/ldt.c b/osfmk/i386/ldt.c
index 13ed8cd32..4027c05f2 100644
--- a/osfmk/i386/ldt.c
+++ b/osfmk/i386/ldt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2012 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -57,50 +57,17 @@
  */
 
 /*
- * "Local" descriptor table.  At the moment, all tasks use the
+ * "Local" descriptor table. At the moment, all tasks use the
  * same LDT.
  */
 #include <i386/seg.h>
-#include <i386/pmap.h>
-#include <mach/i386/vm_types.h>
-#include <mach/i386/vm_param.h>
 
 
-struct fake_descriptor	master_ldt[LDTSZ] __attribute__ ((aligned (4096))) = {
-	[SEL_TO_INDEX(SYSENTER_CS)] {	/* kernel code (sysenter) */
-		0,
-		0xfffff,
-		SZ_32|SZ_G,
-		ACC_P|ACC_PL_K|ACC_CODE_R
-	},
-	[SEL_TO_INDEX(SYSENTER_DS)] {	/* kernel data (sysenter) */
-		0,
-		0xfffff,
-		SZ_32|SZ_G,
-		ACC_P|ACC_PL_K|ACC_DATA_W
-	},
-	[SEL_TO_INDEX(USER_CS)] {	/* user code segment */
-		0,
-		0xfffff,
-		SZ_32|SZ_G,
-		ACC_P|ACC_PL_U|ACC_CODE_R
-	},
-	[SEL_TO_INDEX(USER_DS)] {	/* user data segment */
-		0,
-		0xfffff,
-		SZ_32|SZ_G,
-		ACC_P|ACC_PL_U|ACC_DATA_W
-	},
-	[SEL_TO_INDEX(USER64_CS)] {	/* user 64-bit code segment */
-		0,
-		0xfffff,
-		SZ_64|SZ_G,
-		ACC_P|ACC_PL_U|ACC_CODE_R
-	},
-	[SEL_TO_INDEX(USER_CTHREAD)] {	/* user cthread segment */
+struct real_descriptor	master_ldt[LDTSZ] __attribute__ ((aligned (4096))) = {
+	[SEL_TO_INDEX(USER_CTHREAD)] = MAKE_REAL_DESCRIPTOR(	/* user cthread segment */
 		0,
 		0xfffff,
 		SZ_32|SZ_G,
 		ACC_P|ACC_PL_U|ACC_DATA_W
-	},
+	),
 };