xnu-1228.tar.gz

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

diff --git a/osfmk/i386/start.s b/osfmk/i386/start.s
index eafe900f66bfd7b86e449cfcb6f28783b58ad01a..3218d3d15f577a719e089f29daf4a7f9ed442926 100644 (file)
--- a/osfmk/i386/start.s
+++ b/osfmk/i386/start.s
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -116,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
 
@@ -286,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
@@ -501,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
@@ -594,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 */