xnu-4903.221.2.tar.gz

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

diff --git a/osfmk/i386/i386_init.c b/osfmk/i386/i386_init.c
index 5a7655de9fbb7679518e0e157f9cd6697366a799..8eb6b7edf6bfbac5244410f60c09888bf1a52b08 100644 (file)
--- a/osfmk/i386/i386_init.c
+++ b/osfmk/i386/i386_init.c
@@ -416,7 +416,7 @@ vstart(vm_offset_t boot_args_start)
 #endif
 
 #if MONOTONIC
-               mt_init();
+               mt_early_init();
 #endif /* MONOTONIC */
 
                first_avail = (vm_offset_t)ID_MAP_VTOP(physfree);
@@ -729,6 +729,7 @@ void doublemap_init(void) {
 
        dblmap_dist = dblmap_base - hdescb;
        idt64_hndl_table0[1] = DBLMAP(idt64_hndl_table0[1]);
+       idt64_hndl_table0[6] = (uint64_t)(uintptr_t)&kernel_stack_mask;
 
        extern cpu_data_t cpshadows[], scdatas[];
        uintptr_t cd1 = (uintptr_t) &cpshadows[0];