9: compute available kernel pages using sizeof(Proc*)

procs come from the dynamic pools, so we don't need
to remove the memory used by possible procs from the
total available.

15 files changed, 15 insertions, 15 deletions

diff --git a/sys/src/9/bcm/main.c b/sys/src/9/bcm/main.c
index 13754d7d8..a5b32d28f 100644
--- a/sys/src/9/bcm/main.c
+++ b/sys/src/9/bcm/main.c
@@ -237,7 +237,7 @@ confinit(void)
 	kpages = conf.npage - conf.upages;
 	kpages *= BY2PG;
 	kpages -= conf.upages*sizeof(Page)
-		+ conf.nproc*sizeof(Proc)
+		+ conf.nproc*sizeof(Proc*)
 		+ conf.nimage*sizeof(Image)
 		+ conf.nswap
 		+ conf.nswppo*sizeof(Page*);
diff --git a/sys/src/9/bcm64/main.c b/sys/src/9/bcm64/main.c
index 4d818408a..38c9770b3 100644
--- a/sys/src/9/bcm64/main.c
+++ b/sys/src/9/bcm64/main.c
@@ -108,7 +108,7 @@ confinit(void)
 	kpages = conf.npage - conf.upages;
 	kpages *= BY2PG;
 	kpages -= conf.upages*sizeof(Page)
-		+ conf.nproc*sizeof(Proc)
+		+ conf.nproc*sizeof(Proc*)
 		+ conf.nimage*sizeof(Image)
 		+ conf.nswap
 		+ conf.nswppo*sizeof(Page*);
diff --git a/sys/src/9/cycv/main.c b/sys/src/9/cycv/main.c
index 7b0275189..569f6cb8e 100644
--- a/sys/src/9/cycv/main.c
+++ b/sys/src/9/cycv/main.c
@@ -117,7 +117,7 @@ confinit(void)
 	kmem = 200*1024*1024;
 	conf.upages = conf.npage - kmem/BY2PG;
 	kmem -= conf.upages*sizeof(Page)
-		+ conf.nproc*sizeof(Proc)
+		+ conf.nproc*sizeof(Proc*)
 		+ conf.nimage*sizeof(Image);
 	mainmem->maxsize = kmem;
 	imagmem->maxsize = kmem - (kmem/10);
diff --git a/sys/src/9/imx8/main.c b/sys/src/9/imx8/main.c
index 7180267dd..324feb5c8 100644
--- a/sys/src/9/imx8/main.c
+++ b/sys/src/9/imx8/main.c
@@ -206,7 +206,7 @@ confinit(void)
 	kpages = conf.npage - conf.upages;
 	kpages *= BY2PG;
 	kpages -= conf.upages*sizeof(Page)
-		+ conf.nproc*sizeof(Proc)
+		+ conf.nproc*sizeof(Proc*)
 		+ conf.nimage*sizeof(Image)
 		+ conf.nswap
 		+ conf.nswppo*sizeof(Page*);
diff --git a/sys/src/9/kw/main.c b/sys/src/9/kw/main.c
index ac42b762f..5c935b926 100644
--- a/sys/src/9/kw/main.c
+++ b/sys/src/9/kw/main.c
@@ -448,7 +448,7 @@ confinit(void)
 	kpages = conf.npage - conf.upages;
 	kpages *= BY2PG;
 	kpages -= conf.upages*sizeof(Page)
-		+ conf.nproc*sizeof(Proc)
+		+ conf.nproc*sizeof(Proc*)
 		+ conf.nimage*sizeof(Image)
 		+ conf.nswap
 		+ conf.nswppo*sizeof(Page*);
diff --git a/sys/src/9/mtx/main.c b/sys/src/9/mtx/main.c
index 3255783e2..b7a0f6704 100644
--- a/sys/src/9/mtx/main.c
+++ b/sys/src/9/mtx/main.c
@@ -233,7 +233,7 @@ confinit(void)
 	 */
 	kpages *= BY2PG;
 	kpages -= conf.upages*sizeof(Page)
-		+ conf.nproc*sizeof(Proc)
+		+ conf.nproc*sizeof(Proc*)
 		+ conf.nimage*sizeof(Image)
 		+ conf.nswap
 		+ conf.nswppo*sizeof(Page*);
diff --git a/sys/src/9/omap/main.c b/sys/src/9/omap/main.c
index 32a83c0d7..913a03b58 100644
--- a/sys/src/9/omap/main.c
+++ b/sys/src/9/omap/main.c
@@ -467,7 +467,7 @@ confinit(void)
 	kpages = conf.npage - conf.upages;
 	kpages *= BY2PG;
 	kpages -= conf.upages*sizeof(Page)
-		+ conf.nproc*sizeof(Proc)
+		+ conf.nproc*sizeof(Proc*)
 		+ conf.nimage*sizeof(Image)
 		+ conf.nswap
 		+ conf.nswppo*sizeof(Page*);
diff --git a/sys/src/9/pc/main.c b/sys/src/9/pc/main.c
index 73f8d5787..b662323ef 100644
--- a/sys/src/9/pc/main.c
+++ b/sys/src/9/pc/main.c
@@ -216,7 +216,7 @@ confinit(void)
 	 */
 	kpages *= BY2PG;
 	kpages -= conf.upages*sizeof(Page)
-		+ conf.nproc*sizeof(Proc)
+		+ conf.nproc*sizeof(Proc*)
 		+ conf.nimage*sizeof(Image)
 		+ conf.nswap
 		+ conf.nswppo*sizeof(Page*);
diff --git a/sys/src/9/pc64/main.c b/sys/src/9/pc64/main.c
index 7da5d11fb..02b551165 100644
--- a/sys/src/9/pc64/main.c
+++ b/sys/src/9/pc64/main.c
@@ -85,7 +85,7 @@ confinit(void)
 	 * datastructures. Mntcache and Mntrpc are not accounted for.
 	 */
 	kpages *= BY2PG;
-	kpages -= conf.nproc*sizeof(Proc)
+	kpages -= conf.nproc*sizeof(Proc*)
 		+ conf.nimage*sizeof(Image)
 		+ conf.nswap
 		+ conf.nswppo*sizeof(Page*);
diff --git a/sys/src/9/port/proc.c b/sys/src/9/port/proc.c
index 0af37022c..9e0a530d9 100644
--- a/sys/src/9/port/proc.c
+++ b/sys/src/9/port/proc.c
@@ -737,7 +737,7 @@ procinit0(void)		/* bad planning - clashes with devproc.c */
 	procalloc.tab = xalloc((conf.nproc+1)*sizeof(Proc*));
 	if(procalloc.tab == nil){
 		xsummary();
-		panic("cannot allocate %lud procs (%ludMB)", conf.nproc, conf.nproc*sizeof(Proc)/(1024*1024));
+		panic("cannot allocate proctab for %lud procs", conf.nproc);
 	}
 	memset(procalloc.tab, 0, (conf.nproc+1)*sizeof(Proc*));
 	pidinit();
diff --git a/sys/src/9/ppc/main.c b/sys/src/9/ppc/main.c
index 059469a4f..9218a1986 100644
--- a/sys/src/9/ppc/main.c
+++ b/sys/src/9/ppc/main.c
@@ -296,7 +296,7 @@ confinit(void)
 	 */
 	kpages *= BY2PG;
 	kpages -= conf.upages*sizeof(Page)
-		+ conf.nproc*sizeof(Proc)
+		+ conf.nproc*sizeof(Proc*)
 		+ conf.nimage*sizeof(Image)
 		+ conf.nswap
 		+ conf.nswppo*sizeof(Page*);
diff --git a/sys/src/9/sgi/main.c b/sys/src/9/sgi/main.c
index 3ccdd505c..31d120068 100644
--- a/sys/src/9/sgi/main.c
+++ b/sys/src/9/sgi/main.c
@@ -362,7 +362,7 @@ confinit(void)
 
 	kpages *= BY2PG;
 	kpages -= conf.upages*sizeof(Page)
-		+ conf.nproc*sizeof(Proc)
+		+ conf.nproc*sizeof(Proc*)
 		+ conf.nimage*sizeof(Image)
 		+ conf.nswap
 		+ conf.nswppo*sizeof(Page*);
diff --git a/sys/src/9/teg2/main.c b/sys/src/9/teg2/main.c
index 276a2fa68..abef6d200 100644
--- a/sys/src/9/teg2/main.c
+++ b/sys/src/9/teg2/main.c
@@ -670,7 +670,7 @@ confinit(void)
 	kpages = conf.npage - conf.upages;
 	kpages *= BY2PG;
 	kpages -= conf.upages*sizeof(Page)
-		+ conf.nproc*sizeof(Proc)
+		+ conf.nproc*sizeof(Proc*)
 		+ conf.nimage*sizeof(Image)
 		+ conf.nswap
 		+ conf.nswppo*sizeof(Page*);
diff --git a/sys/src/9/xen/main.c b/sys/src/9/xen/main.c
index 91eae7923..5590f763b 100644
--- a/sys/src/9/xen/main.c
+++ b/sys/src/9/xen/main.c
@@ -309,7 +309,7 @@ confinit(void)
 	 */
 	kpages *= BY2PG;
 	kpages -= conf.upages*sizeof(Page)
-		+ conf.nproc*sizeof(Proc)
+		+ conf.nproc*sizeof(Proc*)
 		+ conf.nimage*sizeof(Image)
 		+ conf.nswap
 		+ conf.nswppo*sizeof(Page*);
diff --git a/sys/src/9/zynq/main.c b/sys/src/9/zynq/main.c
index 92a650e59..dd40547be 100644
--- a/sys/src/9/zynq/main.c
+++ b/sys/src/9/zynq/main.c
@@ -187,7 +187,7 @@ confinit(void)
 	kmem = 200*1024*1024;
 	conf.upages = conf.npage - kmem/BY2PG;
 	kmem -= conf.upages*sizeof(Page)
-		+ conf.nproc*sizeof(Proc)
+		+ conf.nproc*sizeof(Proc*)
 		+ conf.nimage*sizeof(Image);
 	mainmem->maxsize = kmem;
 	imagmem->maxsize = kmem - (kmem/10);