xnu-4570.51.1.tar.gz

[apple/xnu.git] / osfmk / i386 / seg.h

diff --git a/osfmk/i386/seg.h b/osfmk/i386/seg.h
index 5d555bef90354f8559a90c4fca645fd80564311c..d5760f7aae1ff38a775a61788a14f15cbc2710a2 100644 (file)
--- a/osfmk/i386/seg.h
+++ b/osfmk/i386/seg.h
@@ -90,7 +90,9 @@ selector_to_sel(uint16_t selector)
     return (tconv.sel);
 }
 
-#define LDTSZ          8192            /* size of the kernel ldt in entries */
+#define LDTSZ_MAX      8192    /* maximal size of the kernel ldt in entries */
+#define LDTSZ_DFL      (128)
+#define LDTSZ          (LDTSZ_MAX)
 #define        LDTSZ_MIN       SEL_TO_INDEX(USER_SETTABLE)
                                        /* kernel ldt entries */
 
@@ -177,12 +179,18 @@ struct fake_descriptor64 {
        uint32_t        reserved:32;            /* reserved/zero */
 };
 
+typedef struct __attribute__((packed)) {
+       uint16_t        size;
+       void            *ptr;
+} x86_64_desc_register_t;
+
+
+
 /*
  * Boot-time data for master (or only) CPU
  */
-extern struct fake_descriptor  master_idt[IDTSZ];
 extern struct real_descriptor  master_gdt[GDTSZ];
-extern struct real_descriptor  master_ldt[LDTSZ];
+extern struct real_descriptor  master_ldt[];
 extern struct i386_tss         master_ktss;
 extern struct sysenter_stack   master_sstk;
 
@@ -281,6 +289,7 @@ __END_DECLS
 #define SYSENTER_TF_CS (USER_CS|0x10000)
 #define        SYSENTER_DS     KERNEL64_SS     /* sysenter kernel data segment */
 
+#endif /* _I386_SEG_H_ */
 #ifdef __x86_64__
 /*
  * 64-bit kernel LDT descriptors
@@ -289,5 +298,3 @@ __END_DECLS
 #define        USER_CTHREAD    0x0f            /* user cthread area */
 #define        USER_SETTABLE   0x1f            /* start of user settable ldt entries */
 #endif
-
-#endif /* _I386_SEG_H_ */