xnu-2050.22.13.tar.gz

[apple/xnu.git] / osfmk / i386 / ldt.c

diff --git a/osfmk/i386/ldt.c b/osfmk/i386/ldt.c
index 13ed8cd32d94a1c48edcbead01174dfaaef94646..ff1facd343d614586f4012390dd438f5d45c126b 100644 (file)
--- 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>
  * 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
                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
                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,
                0,
                0xfffff,

-               SZ_32|SZ_G,
+               SZ_32|SZ_G,

                ACC_P|ACC_PL_U|ACC_CODE_R
                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
                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
                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
                0,
                0xfffff,
                SZ_32|SZ_G,
                ACC_P|ACC_PL_U|ACC_DATA_W

-       },
+       ),

 };
 };