xnu-3247.1.106.tar.gz

[apple/xnu.git] / bsd / conf / param.c

diff --git a/bsd/conf/param.c b/bsd/conf/param.c
index 5e7191195ebbcbf96abaebaeac0b0439c48cad3e..f9feaa2c070fb9f0ddf2610e972a9c82925bda04 100644 (file)
--- a/bsd/conf/param.c
+++ b/bsd/conf/param.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -65,7 +65,6 @@
  *     @(#)param.c     8.3 (Berkeley) 8/20/94
  */
 
-#include <confdep.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
@@ -77,33 +76,34 @@
 #include <sys/domain.h>
 #include <sys/kernel.h>
 #include <sys/quota.h>
-#include <ufs/ufs/inode.h>
 #include <miscfs/fifofs/fifo.h>
 #include <sys/shm_internal.h>
 #include <sys/aio_kern.h>
 
-struct timezone tz = { TIMEZONE, PST };
+struct timezone tz = { 0, 0 };
+
+#define        NPROC (20 + 16 * 32)
+#define        NPROC_PER_UID (NPROC/2)
 
-#define        NPROC (20 + 16 * MAXUSERS)
 #define HNPROC 2500    /* based on thread_max */
 int    maxproc = NPROC;
-int    maxprocperuid = NPROC/2;
-/*__private_extern__*/ int hard_maxproc = HNPROC;      /* hardcoded limit */
+int    maxprocperuid = NPROC_PER_UID;
+
+int hard_maxproc = HNPROC;     /* hardcoded limit */
+
 int nprocs = 0; /* XXX */
 
 //#define      NTEXT (80 + NPROC / 8)                  /* actually the object cache */
-int    desiredvnodes = CONFIG_VNODES;
+int desiredvnodes = 0;                         /* desiredvnodes is set explicitly in unix_startup.c */
+uint32_t kern_maxvnodes = 0;           /* global, to be read from the device tree */
 
 #define MAXFILES (OPEN_MAX + 2048)
 int    maxfiles = MAXFILES;
 
 unsigned int   ncallout = 16 + 2*NPROC;
-int nmbclusters = NMBCLUSTERS;
+unsigned int nmbclusters = NMBCLUSTERS;
 int    nport = NPROC / 2;
 
-#define MAXSOCKETS NMBCLUSTERS
-int    maxsockets = MAXSOCKETS;
-
 /*
  *  async IO (aio) configurable limits
  */
@@ -121,5 +121,4 @@ struct      cblock *cfree;
 struct cblock *cfreelist = NULL;
 int    cfreecount = 0;
 struct buf *buf_headers;
-struct domain *domains;
-
+struct domains_head domains = TAILQ_HEAD_INITIALIZER(domains);