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

diff --git a/osfmk/i386/ldt.c b/osfmk/i386/ldt.c
index edac635cc..ff1facd34 100644
--- a/osfmk/i386/ldt.c
+++ b/osfmk/i386/ldt.c
@@ -1,31 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * This file contains Original Code and/or Modifications of Original Code 
- * as defined in and that are subject to the Apple Public Source License 
- * Version 2.0 (the 'License'). You may not use this file except in 
- * compliance with the License.  The rights granted to you under the 
- * License may not be used to create, or enable the creation or 
- * redistribution of, unlawful or unlicensed copies of an Apple operating 
- * system, or to circumvent, violate, or enable the circumvention or 
- * violation of, any terms of an Apple operating system software license 
- * agreement.
- *
- * Please obtain a copy of the License at 
- * http://www.opensource.apple.com/apsl/ and read it before using this 
- * file.
- *
- * The Original Code and all software distributed under the License are 
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
  * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -59,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
-	},
+	),
 };