xnu-344.21.73.tar.gz

[apple/xnu.git] / osfmk / i386 / AT386 / model_dep.c

diff --git a/osfmk/i386/AT386/model_dep.c b/osfmk/i386/AT386/model_dep.c
index c3cb5bc941d2aa0c5ae2e383ec9a1091269bacdf..b8ac30cd58f175b4447881bdbe19ac1e71a5e913 100644 (file)
--- a/osfmk/i386/AT386/model_dep.c
+++ b/osfmk/i386/AT386/model_dep.c
@@ -3,19 +3,22 @@
  *
  * @APPLE_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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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. 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@
  */
@@ -115,7 +118,8 @@
 
 #include <IOKit/IOPlatformExpert.h>
 
-vm_size_t      mem_size = 0; 
+vm_size_t      mem_size = 0;
+uint64_t       max_mem;
 vm_offset_t    first_addr = 0; /* set by start.s - keep out of bss */
 vm_offset_t    first_avail = 0;/* first after page tables */
 vm_offset_t    last_addr;
@@ -367,7 +371,7 @@ machine_init(void)
         * Display CPU identification
         */
        cpuid_cpu_display("CPU identification", 0);
-       cpuid_cache_display("CPU configuration", 0);
+       cpuid_feature_display("CPU features", 0);
 
 #if    MP_V1_1
        mp_v1_1_init();
@@ -508,6 +512,7 @@ i386_init(void)
        first_addr = round_page(first_addr);
        last_addr = trunc_page(last_addr);
        mem_size = last_addr - bios_hole_size;
+       max_mem = mem_size;
 
        avail_start = first_addr;
        avail_end = last_addr;