xnu-2050.22.13.tar.gz

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

diff --git a/osfmk/i386/idle_pt.c b/osfmk/i386/idle_pt.c
index 663375acf4eb0397a6634cfc07c39e22a295abc8..4110c212ef841e2cb7621e5d3bf9f2ce17a7bda3 100644 (file)
--- a/osfmk/i386/idle_pt.c
+++ b/osfmk/i386/idle_pt.c
@@ -28,28 +28,18 @@
 #include <i386/pmap.h>
 
 #define PML4_PROT (INTEL_PTE_VALID | INTEL_PTE_WRITE)
-pml4_entry_t   IdlePML4[PTE_PER_PAGE] __attribute__((section("__INITPT, __data"))) = {
-#ifdef __x86_64__
-               [  0]
-                       = ((uint64_t)(INITPT_SEG_BASE + PAGE_SIZE) | PML4_PROT),
-#if KERNEL_PML4_INDEX != 0
-               [KERNEL_PML4_INDEX]
-                       = ((uint64_t)(INITPT_SEG_BASE + PAGE_SIZE) | PML4_PROT),
-#endif
-#endif
-       };
+pml4_entry_t   IdlePML4[PTE_PER_PAGE]
+               __attribute__((section("__INITPT, __data"))) = {
+};
 
-#if defined(__x86_64__)
-#define PDPT_PROT (INTEL_PTE_VALID | INTEL_PTE_WRITE)
-#elif defined(__i386__)
 #define PDPT_PROT (INTEL_PTE_VALID)
-#endif
-pdpt_entry_t   IdlePDPT[PTE_PER_PAGE] __attribute__((section("__INITPT, __data"))) = {
-               [0] = ((uint64_t)(INITPT_SEG_BASE + 2*PAGE_SIZE) | PDPT_PROT), 
-               [1] = ((uint64_t)(INITPT_SEG_BASE + 3*PAGE_SIZE) | PDPT_PROT), 
-               [2] = ((uint64_t)(INITPT_SEG_BASE + 4*PAGE_SIZE) | PDPT_PROT), 
-               [3] = ((uint64_t)(INITPT_SEG_BASE + 5*PAGE_SIZE) | PDPT_PROT), 
-       };
+pdpt_entry_t   IdlePDPT[PTE_PER_PAGE]
+               __attribute__((section("__INITPT, __data"))) = {
+       [0] = ((uint64_t)(INITPT_SEG_BASE + 2*PAGE_SIZE) | PDPT_PROT), 
+       [1] = ((uint64_t)(INITPT_SEG_BASE + 3*PAGE_SIZE) | PDPT_PROT), 
+       [2] = ((uint64_t)(INITPT_SEG_BASE + 4*PAGE_SIZE) | PDPT_PROT), 
+       [3] = ((uint64_t)(INITPT_SEG_BASE + 5*PAGE_SIZE) | PDPT_PROT), 
+};
 
 #if NPGPTD != 4
 #error Please update idle_pt.c to reflect the new value of NPGPTD
@@ -74,7 +64,8 @@ pdpt_entry_t  IdlePDPT[PTE_PER_PAGE] __attribute__((section("__INITPT, __data")))
 
 #define FOR_0_TO_2047(x) L11(x,2047)
 
-pd_entry_t             BootstrapPTD[2048] __attribute__((section("__INITPT, __data"))) = {
+pd_entry_t     BootPTD[2048]
+               __attribute__((section("__INITPT, __data"))) = {
        FOR_0_TO_2047(ID_MAP_2MEG)
 };
 #endif /* MACHINE_BOOTSTRAPPTD */