shithub: riscv

Info  •  Files  •  Log  •  Branches

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){

 		/*