Date: Sat, 25 Oct 1997 12:45:34 +0800 From: Peter Wemm <peter@netplex.com.au> To: "John S. Dyson" <toor@dyson.iquest.net> Cc: bde@zeta.org.au (Bruce Evans), cvs-all@FreeBSD.ORG, cvs-committers@FreeBSD.ORG, cvs-sys@FreeBSD.ORG, dyson@FreeBSD.ORG Subject: Re: cvs commit: src/sys/vm vm_map.c vm_object.c src/sys/i386/i386 pmap.c Message-ID: <199710250445.MAA10256@spinner.netplex.com.au> In-Reply-To: Your message of "Fri, 24 Oct 1997 23:14:05 EST." <199710250414.XAA01633@dyson.iquest.net>
next in thread | previous in thread | raw e-mail | index | archive | help
"John S. Dyson" wrote:
> Bruce Evans said:
> > > Modified files:
> > > sys/vm vm_map.c vm_object.c
> > > sys/i386/i386 pmap.c
> > > Log:
> > > Decrease the initial allocation for the zone allocations.
> >
> > The initial allocation is still huge. 224K of real memory is statically
> > allocated for pvinit[8192] alone. 3/4 of this normally remains free on
> > my 32MB system.
> >
> I guess that could be made smaller. That is not really the "zone allocator"
> but one of the clients (pmap.) The key is to make it large enough to boot,
> maybe should be allocated with kmem_alloc..
>
Something fouled up here.. There's a conflict marker in the commit:
peter@spinner[12:43pm]~src/sys/i386/i386-233> cvs diff -u -r1.164 -r1.165 pmap.c
Index: pmap.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/i386/pmap.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- pmap.c 1997/10/24 23:41:04 1.164
+++ pmap.c 1997/10/25 02:41:51 1.165
[[...]]
@@ -535,8 +539,15 @@
void
pmap_init2() {
+<<<<<<< pmap.c
+ pv_entry_max = PMAP_SHPGPERPROC * maxproc + pv_npg;
+ pv_entry_high_water = 9 * (pv_entry_max / 10);
+ pv_entry_low_water = 4 * (pv_entry_max / 10);
+ zinitna(pvzone, &pvzone_obj, NULL, 0, pv_entry_max, ZONE_INTERRUPT, 1);
+=======
zinitna(pvzone, &pvzone_obj, NULL, 0,
PMAP_SHPGPERPROC * maxproc + pv_npg, ZONE_INTERRUPT, 1);
+>>>>>>> 1.164
}
/*
Which form is correct? :-)
Cheers,
-Peter
--
Peter Wemm <peter@netplex.com.au> Netplex Consulting
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199710250445.MAA10256>