xnu-1504.7.4.tar.gz

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

diff --git a/osfmk/i386/ktss.c b/osfmk/i386/ktss.c
index a947de6e60ebb74aeae8bbd379119fd36731ba9c..973fc395adf1a0b4b090845e8fc10fa45a6dc78b 100644 (file)
--- a/osfmk/i386/ktss.c
+++ b/osfmk/i386/ktss.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -61,12 +61,12 @@
  *
  * We don't use the i386 task switch mechanism.  We need a TSS
  * only to hold the kernel stack pointer for the current thread.
- *
  */
 #include <i386/tss.h>
-#include <i386/seg.h>
+#include <i386/pmap.h>
 #include <mach_kdb.h>
 
+#ifdef __i386__
 struct i386_tss        master_ktss
        __attribute__ ((section ("__DESC, master_ktss")))
        __attribute__ ((aligned (4096))) = {
@@ -100,6 +100,7 @@ struct i386_tss     master_ktss
                                           beyond end of TSS segment,
                                           so no bitmap */
 };
+#endif
 
 /*
  * The transient stack for sysenter.
@@ -116,9 +117,8 @@ struct x86_64_tss master_ktss64 __attribute__ ((aligned (4096))) = {
        .io_bit_map_offset = 0x0FFF,
 };
 #endif /* X86_64 */
- 
-
 
+#ifdef __i386__
 /*
  * Task structure for double-fault handler:
  */
@@ -132,7 +132,7 @@ struct i386_tss     master_dftss
        0,                              /* ss1 */
        0,                              /* esp2 */
        0,                              /* ss2 */
-       0,                              /* cr3 */
+       (int) IdlePDPT,                         /* cr3 */
        (int) &df_task_start,           /* eip */
        0,                              /* eflags */
        0,                              /* eax */
@@ -144,7 +144,7 @@ struct i386_tss     master_dftss
        0,                              /* esi */
        0,                              /* edi */
        KERNEL_DS,                      /* es */
-       KERNEL_CS,                      /* cs */
+       KERNEL32_CS,                    /* cs */
        KERNEL_DS,                      /* ss */
        KERNEL_DS,                      /* ds */
        KERNEL_DS,                      /* fs */
@@ -170,7 +170,7 @@ struct i386_tss     master_mctss
        0,                              /* ss1 */
        0,                              /* esp2 */
        0,                              /* ss2 */
-       0,                              /* cr3 */
+       (int) IdlePDPT,                         /* cr3 */
        (int) &mc_task_start,           /* eip */
        0,                              /* eflags */
        0,                              /* eax */
@@ -182,7 +182,7 @@ struct i386_tss     master_mctss
        0,                              /* esi */
        0,                              /* edi */
        KERNEL_DS,                      /* es */
-       KERNEL_CS,                      /* cs */
+       KERNEL32_CS,                    /* cs */
        KERNEL_DS,                      /* ss */
        KERNEL_DS,                      /* ds */
        KERNEL_DS,                      /* fs */
@@ -206,7 +206,7 @@ struct i386_tss     master_dbtss
        0,                              /* ss1 */
        0,                              /* esp2 */
        0,                              /* ss2 */
-       0,                              /* cr3 */
+       (int) IdlePDPT,         /* cr3 */
        0,                              /* eip */
        0,                              /* eflags */
        0,                              /* eax */
@@ -218,7 +218,7 @@ struct i386_tss     master_dbtss
        0,                              /* esi */
        0,                              /* edi */
        KERNEL_DS,                      /* es */
-       KERNEL_CS,                      /* cs */
+       KERNEL32_CS,                    /* cs */
        KERNEL_DS,                      /* ss */
        KERNEL_DS,                      /* ds */
        KERNEL_DS,                      /* fs */
@@ -231,3 +231,4 @@ struct i386_tss     master_dbtss
 };
 
 #endif /* MACH_KDB */
+#endif