xnu-4570.51.1.tar.gz

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

diff --git a/osfmk/i386/ldt.c b/osfmk/i386/ldt.c
index ff1facd343d614586f4012390dd438f5d45c126b..6e1a1e1150ef9a2c8b1360f733b51050394b4016 100644 (file)
--- 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@
  * 
@@ -62,40 +62,9 @@
  */
 #include <i386/seg.h>
 
-
-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)] = 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)] = MAKE_REAL_DESCRIPTOR( /* user code segment */
-               0,
-               0xfffff,
-               SZ_32|SZ_G,
-               ACC_P|ACC_PL_U|ACC_CODE_R
-       ),
-       [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)] = MAKE_REAL_DESCRIPTOR(       /* user 64-bit code segment */
-               0,
-               0xfffff,
-               SZ_64|SZ_G,
-               ACC_P|ACC_PL_U|ACC_CODE_R
-       ),
-#endif
+struct real_descriptor master_ldt[LDTSZ] __attribute__ ((aligned (4096)))
+       __attribute__ ((section ("__HIB, __desc")))
+       = {
        [SEL_TO_INDEX(USER_CTHREAD)] = MAKE_REAL_DESCRIPTOR(    /* user cthread segment */
                0,
                0xfffff,
@@ -103,3 +72,5 @@ struct real_descriptor       master_ldt[LDTSZ] __attribute__ ((aligned (4096))) = {
                ACC_P|ACC_PL_U|ACC_DATA_W
        ),
 };
+
+unsigned mldtsz = sizeof(master_ldt);