diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/vax/include/pmap.h | 4 | ||||
| -rw-r--r-- | sys/arch/vax/include/vmparam.h | 12 | ||||
| -rw-r--r-- | sys/arch/vax/vax/pmap.c | 5 |
3 files changed, 7 insertions, 14 deletions
diff --git a/sys/arch/vax/include/pmap.h b/sys/arch/vax/include/pmap.h index e9cc44d8ec3..d1d483686d3 100644 --- a/sys/arch/vax/include/pmap.h +++ b/sys/arch/vax/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.24 2004/08/06 22:39:14 deraadt Exp $ */ +/* $OpenBSD: pmap.h,v 1.25 2005/06/29 06:07:04 deraadt Exp $ */ /* $NetBSD: pmap.h,v 1.37 1999/08/01 13:48:07 ragge Exp $ */ /* @@ -53,7 +53,7 @@ */ #define LTOHPS (PGSHIFT - VAX_PGSHIFT) #define LTOHPN (1 << LTOHPS) -#define USRPTSIZE ((MAXTSIZ + MAXDSIZ + MAXSSIZ + MMAPSPACE) / VAX_NBPG) +#define USRPTSIZE ((MAXTSIZ + 40*1024*1024 + MAXSSIZ) / VAX_NBPG) #define NPTEPGS (USRPTSIZE / (sizeof(pt_entry_t) * LTOHPN)) /* diff --git a/sys/arch/vax/include/vmparam.h b/sys/arch/vax/include/vmparam.h index 69c8ac0bc78..57a96bddddf 100644 --- a/sys/arch/vax/include/vmparam.h +++ b/sys/arch/vax/include/vmparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmparam.h,v 1.22 2005/04/11 15:13:01 deraadt Exp $ */ +/* $OpenBSD: vmparam.h,v 1.23 2005/06/29 06:07:04 deraadt Exp $ */ /* $NetBSD: vmparam.h,v 1.32 2000/03/07 00:05:59 matt Exp $ */ /*- @@ -61,7 +61,7 @@ #define MAXTSIZ (8*1024*1024) /* max text size */ #endif #ifndef MAXDSIZ -#define MAXDSIZ (8*1024*1024) /* max data size */ +#define MAXDSIZ (40*1024*1024) /* max data size */ #endif #ifndef MAXSSIZ #define MAXSSIZ (8*1024*1024) /* max stack size */ @@ -75,13 +75,7 @@ #define STACKGAP_RANDOM 32*1024 -/* - * All mmap()'ed data will be mapped above MAXDSIZ. This means that - * pte space must be allocated for (possible) mmap()'ed data. - * Note: This is just a hint, if we mmap() more than this the page - * table will be expanded. (at the cost of speed). - */ -#define MMAPSPACE (24*1024*1024) +#define BRKSIZ (8*1024*1024) /* * Size of shared memory map diff --git a/sys/arch/vax/vax/pmap.c b/sys/arch/vax/vax/pmap.c index b0598d4f20e..d0c27cbaf1e 100644 --- a/sys/arch/vax/vax/pmap.c +++ b/sys/arch/vax/vax/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.34 2005/04/04 23:40:05 miod Exp $ */ +/* $OpenBSD: pmap.c,v 1.35 2005/06/29 06:07:07 deraadt Exp $ */ /* $NetBSD: pmap.c,v 1.74 1999/11/13 21:32:25 matt Exp $ */ /* * Copyright (c) 1994, 1998, 1999 Ludd, University of Lule}, Sweden. @@ -135,7 +135,6 @@ pmap_bootstrap() * Remember: sysptsize is in PTEs and nothing else! */ -#define USRPTSIZE ((MAXTSIZ + MAXDSIZ + MAXSSIZ + MMAPSPACE) / VAX_NBPG) /* Kernel alloc area */ sysptsize = (((0x100000 * maxproc) >> VAX_PGSHIFT) / 4); /* reverse mapping struct */ @@ -404,7 +403,7 @@ pmap_pinit(pmap) (u_long *)&pmap->pm_p0br); if (res) panic("pmap_pinit"); - pmap->pm_p0lr = vax_btoc(MAXTSIZ + MAXDSIZ + MMAPSPACE) | AST_PCB; + pmap->pm_p0lr = vax_btoc(MAXTSIZ + USRPTSIZE) | AST_PCB; (vaddr_t)pmap->pm_p1br = (vaddr_t)pmap->pm_p0br + bytesiz - 0x800000; pmap->pm_p1lr = (0x200000 - vax_btoc(MAXSSIZ)); pmap->pm_stack = USRSTACK; |