X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/43866e378188c25dd1e2208016ab3cbeb086ae6c..5eebf7385fedb1517b66b53c28e5aa6bb0a2be50:/bsd/dev/ppc/unix_startup.c?ds=inline

diff --git a/bsd/dev/ppc/unix_startup.c b/bsd/dev/ppc/unix_startup.c
index 05b16e597..717fddc9f 100644
--- a/bsd/dev/ppc/unix_startup.c
+++ b/bsd/dev/ppc/unix_startup.c
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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. 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
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -68,7 +65,7 @@ bsd_startupearly()
 	kern_return_t	ret;
 
 	if (nbuf == 0)
-		nbuf = atop(mem_size / 100); /* 1% */
+		nbuf = atop_64(sane_size / 100); /* Get 1% of ram, but no more than we can map */
 	if (nbuf > 8192)
 		nbuf = 8192;
 	if (nbuf < 256)
@@ -82,7 +79,7 @@ bsd_startupearly()
 		niobuf = 128;
 
 	size = (nbuf + niobuf) * sizeof (struct buf);
-	size = round_page(size);
+	size = round_page_32(size);
 
 	ret = kmem_suballoc(kernel_map,
 			&firstaddr,
@@ -106,13 +103,13 @@ bsd_startupearly()
 	buf = (struct buf * )firstaddr;
 	bzero(buf,size);
 
-	if ((mem_size > (64 * 1024 * 1024)) || ncl) {
+	if ((sane_size > (64 * 1024 * 1024)) || ncl) {
 		int scale;
 		extern u_long tcp_sendspace;
 		extern u_long tcp_recvspace;
 
 		if ((nmbclusters = ncl) == 0) {
-			if ((nmbclusters = ((mem_size / 16) / MCLBYTES)) > 16384)
+			if ((nmbclusters = ((sane_size / 16) / MCLBYTES)) > 16384)
 				nmbclusters = 16384;
 		}
 		if ((scale = nmbclusters / NMBCLUSTERS) > 1) {
@@ -137,7 +134,7 @@ bsd_bufferinit()
 	bsd_startupearly();
 
    	ret = kmem_suballoc(kernel_map,
-			&mbutl,
+			(vm_offset_t *) &mbutl,
 			(vm_size_t) (nmbclusters * MCLBYTES),
 			FALSE,
 			TRUE,