git: 9front

Download patch

ref: 2364db56443b2eeee2787ec91c2035070d7498e9
parent: 1a324c3c7b0912a09c95ffd0d7c76c69b6e6af7c
author: cinap_lenrek <cinap_lenrek@felloff.net>
date: Wed Dec 17 05:03:45 EST 2014

teg2, xen: remove unused bootdisk[] and fix conf.nswppo factor in kernel memory size calculation

--- a/sys/src/9/teg2/main.c
+++ b/sys/src/9/teg2/main.c
@@ -909,7 +909,7 @@
 		+ conf.nproc*sizeof(Proc)
 		+ conf.nimage*sizeof(Image)
 		+ conf.nswap
-		+ conf.nswppo*sizeof(Page);
+		+ conf.nswppo*sizeof(Page*);
 	mainmem->maxsize = kpages;
 	if(!cpuserver)
 		/*
--- a/sys/src/9/xen/main.c
+++ b/sys/src/9/xen/main.c
@@ -21,7 +21,6 @@
 	Ustkheadroom	= sizeof(Sargs) + sizeof(uintptr) + sizeof(Tos),
 };
 
-char bootdisk[KNAMELEN];
 Conf conf;
 char *confname[MAXCONF];
 char *confval[MAXCONF];
@@ -431,7 +430,7 @@
 		+ conf.nproc*sizeof(Proc)
 		+ conf.nimage*sizeof(Image)
 		+ conf.nswap
-		+ conf.nswppo*sizeof(Page);
+		+ conf.nswppo*sizeof(Page*);
 	mainmem->maxsize = kpages;
 	if(!cpuserver){
 		/*
--