xnu-1228.15.4.tar.gz

[apple/xnu.git] / osfmk / i386 / start.s

diff --git a/osfmk/i386/start.s b/osfmk/i386/start.s
index 08f671378748ad46e0c3554df0040453c8f6e81c..e063283aae6f19afe43040ba55b5df9422895004 100644 (file)
--- a/osfmk/i386/start.s
+++ b/osfmk/i386/start.s
@@ -66,7 +66,7 @@
 
 #define        CX(addr,reg)    addr(,reg,4)
 
 
 #define        CX(addr,reg)    addr(,reg,4)
 

-#include <i386/mp.h>
+#include <i386/lapic.h>

 #include <i386/mp_slave_boot.h>
 #include <i386/cpuid.h>
 
 #include <i386/mp_slave_boot.h>
 #include <i386/cpuid.h>
 


@@ -122,7 +122,7 @@ LEXT(idtptr)
        .word   Times(8,IDTSZ)-1
        .long   EXT(master_idt)
 
        .word   Times(8,IDTSZ)-1
        .long   EXT(master_idt)
 

-        /* back to the regular __DATA section. */
+          /* back to the regular __DATA section. */

 
           .section __DATA, __data
 
 
           .section __DATA, __data
 


@@ -292,7 +292,7 @@ Ls1:        popl    %esi                    // Get return address
        movl    KSIZE(%ebp), %ecx       // Set ecx to kernbootstruct ksize
        addl    $(NBPG-1), %ecx         // Add NBPG-1 to ecx
        andl    $(-NBPG), %ecx          // Truncate  ecx to a page aligned addr
        movl    KSIZE(%ebp), %ecx       // Set ecx to kernbootstruct ksize
        addl    $(NBPG-1), %ecx         // Add NBPG-1 to ecx
        andl    $(-NBPG), %ecx          // Truncate  ecx to a page aligned addr

-       sarl    $2, %ecx                // Divide ecx by 4
+       shrl    $2, %ecx                // Divide ecx by 4

        movl    %esp, (PA(EXT(KernelRelocOffset)))(%esp)
                                        // Store relocation offset
        movl    %edi, KADDR(%ebp)       // Relocate kaddr in kernbootstruct
        movl    %esp, (PA(EXT(KernelRelocOffset)))(%esp)
                                        // Store relocation offset
        movl    %edi, KADDR(%ebp)       // Relocate kaddr in kernbootstruct


@@ -507,7 +507,7 @@ fix_ldt_ret:
        movl    %eax, %cr3
 
        movl    %cr4, %eax
        movl    %eax, %cr3
 
        movl    %cr4, %eax

-       orl     $(CR4_PAE|CR4_PGE), %eax
+       orl     $(CR4_PAE), %eax

        movl    %eax, %cr4
 
        movl    $0x80000001, %eax
        movl    %eax, %cr4
 
        movl    $0x80000001, %eax


@@ -600,7 +600,7 @@ LEXT(slave_pstart)
  */
 #ifdef PAE
        movl    %cr4, %eax
  */
 #ifdef PAE
        movl    %cr4, %eax

-       orl     $(CR4_PAE|CR4_PGE), %eax
+       orl     $(CR4_PAE), %eax

        movl    %eax, %cr4
 
        movl    $(MSR_IA32_EFER), %ecx                  /* MSR number in ecx */
        movl    %eax, %cr4
 
        movl    $(MSR_IA32_EFER), %ecx                  /* MSR number in ecx */