X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/4452a7af2eac33dbad800bcc91f2399d62c18f53..e2fac8b15b12a7979f72090454d850e612fc5b13:/osfmk/i386/start.s

diff --git a/osfmk/i386/start.s b/osfmk/i386/start.s
index 08f671378..e063283aa 100644
--- a/osfmk/i386/start.s
+++ b/osfmk/i386/start.s
@@ -66,7 +66,7 @@
 
 #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>
 
@@ -122,7 +122,7 @@ LEXT(idtptr)
 	.word	Times(8,IDTSZ)-1
 	.long	EXT(master_idt)
 
-        /* back to the regular __DATA section. */
+          /* back to the regular __DATA section. */
 
           .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
-	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
@@ -507,7 +507,7 @@ fix_ldt_ret:
 	movl	%eax, %cr3
 
 	movl	%cr4, %eax
-	orl	$(CR4_PAE|CR4_PGE), %eax
+	orl	$(CR4_PAE), %eax
 	movl	%eax, %cr4
 
 	movl	$0x80000001, %eax
@@ -600,7 +600,7 @@ LEXT(slave_pstart)
  */
 #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 */