X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/89b3af67bb32e691275bf6fa803d1834b2284115..db6096698656d32db7df630594bd9617ee54f828:/osfmk/i386/ldt.c?ds=sidebyside

diff --git a/osfmk/i386/ldt.c b/osfmk/i386/ldt.c
index 13ed8cd32..ff1facd34 100644
--- a/osfmk/i386/ldt.c
+++ b/osfmk/i386/ldt.c
@@ -57,50 +57,49 @@
  */
 
 /*
- * "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) */
+struct real_descriptor	master_ldt[LDTSZ] __attribute__ ((aligned (4096))) = {
+#ifdef __i386__
+	[SEL_TO_INDEX(SYSENTER_CS)] = MAKE_REAL_DESCRIPTOR(	/* 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) */
+	),
+	[SEL_TO_INDEX(SYSENTER_DS)] = MAKE_REAL_DESCRIPTOR(	/* 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 */
+	),
+	[SEL_TO_INDEX(USER_CS)] = MAKE_REAL_DESCRIPTOR(	/* user code segment */
 		0,
 		0xfffff,
-		SZ_32|SZ_G,
+ 		SZ_32|SZ_G,
 		ACC_P|ACC_PL_U|ACC_CODE_R
-	},
-	[SEL_TO_INDEX(USER_DS)] {	/* user data segment */
+	),
+	[SEL_TO_INDEX(USER_DS)] = MAKE_REAL_DESCRIPTOR(	/* 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 */
+	),
+	[SEL_TO_INDEX(USER64_CS)] = MAKE_REAL_DESCRIPTOR(	/* 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 */
+	),
+#endif
+	[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
-	},
+	),
 };