From 57fa6bb861fb8b9a053bccbc4ed0d47f9a99335e Mon Sep 17 00:00:00 2001
From: ragge <ragge@NetBSD.org>
Date: Sun, 14 Dec 2003 19:39:24 +0000
Subject: [PATCH] TOPDOWN_VM is now mandatory on vax.

---
 sys/arch/vax/conf/GENERIC      |  5 ++---
 sys/arch/vax/include/pmap.h    |  5 +----
 sys/arch/vax/include/vmparam.h | 25 ++-----------------------
 sys/arch/vax/vax/pmap.c        |  8 ++------
 4 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC
index 988163e807ae..c721f347b426 100644
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.115 2003/10/19 15:03:25 ragge Exp $
+# $NetBSD: GENERIC,v 1.116 2003/12/14 19:39:24 ragge Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/vax/conf/std.vax"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.115 $"
+#ident 		"GENERIC-$Revision: 1.116 $"
 
 # Here are all different supported CPU types listed.
 #options 	VAX8800		# VAX 8500, 8530, 8550, 8700, 8800
@@ -54,7 +54,6 @@ options 	KTRACE
 options 	SYSTRACE	# system call vetting via systrace(1)
 #options 	DIAGNOSTIC
 #options 	DEBUG,KMEMSTATS,PMAPDEBUG,TRAPDEBUG,LOCKDEBUG
-options 	USE_TOPDOWN_VM	# gives larger address space
 
 options 	SCSIVERBOSE		# Verbose SCSI errors
 
diff --git a/sys/arch/vax/include/pmap.h b/sys/arch/vax/include/pmap.h
index 863b60f608fd..40a6d6bf8f00 100644
--- a/sys/arch/vax/include/pmap.h
+++ b/sys/arch/vax/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.59 2003/08/07 16:30:11 agc Exp $	   */
+/*	$NetBSD: pmap.h,v 1.60 2003/12/14 19:39:24 ragge Exp $	   */
 
 /* 
  * Copyright (c) 1991 Regents of the University of California.
@@ -90,9 +90,6 @@
  */
 #define LTOHPS		(PGSHIFT - VAX_PGSHIFT)
 #define LTOHPN		(1 << LTOHPS)
-#if USE_TOPDOWN_VM==0
-#define PROCPTSIZE	((MAXTSIZ + MAXDSIZ + MAXSSIZ + MMAPSPACE) / VAX_NBPG)
-#endif
 
 /*
  * Link struct if more than one process share pmap (like vfork).
diff --git a/sys/arch/vax/include/vmparam.h b/sys/arch/vax/include/vmparam.h
index 407f3a5366a5..505b2e82f699 100644
--- a/sys/arch/vax/include/vmparam.h
+++ b/sys/arch/vax/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.41 2003/08/07 16:30:13 agc Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.42 2003/12/14 19:39:24 ragge Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -64,21 +64,12 @@
 #ifndef MAXTSIZ
 #define MAXTSIZ		(8*1024*1024)		/* max text size */
 #endif
-#if USE_TOPDOWN_VM==1
 #ifndef DFLDSIZ
 #define DFLDSIZ		(128*1024*1024)		/* initial data size limit */
 #endif
 #ifndef MAXDSIZ
 #define MAXDSIZ		(1024*1024*1024)	/* max data size */
 #endif
-#else
-#ifndef DFLDSIZ
-#define DFLDSIZ		(32*1024*1024)		/* initial data size limit */
-#endif
-#ifndef MAXDSIZ
-#define MAXDSIZ		(64*1024*1024)		/* max data size */
-#endif
-#endif
 #ifndef DFLSSIZ
 #define DFLSSIZ		(512*1024)		/* initial stack size limit */
 #endif
@@ -86,16 +77,6 @@
 #define MAXSSIZ		(8*1024*1024)		/* max stack size */
 #endif
 
-#ifndef USE_TOPDOWN_VM
-/*
- * 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	(8*1024*1024)
-#endif
-
 /* 
  * Size of shared memory map
  */
@@ -129,11 +110,9 @@
 /*
  * The address to which unspecified mapping requests default
  */
-#define __HAVE_TOPDOWN_VM
-#ifdef USE_TOPDOWN_VM
+#define __USE_TOPDOWN_VM
 #define VM_DEFAULT_ADDRESS(da, sz) \
 	trunc_page(VM_MAXUSER_ADDRESS - MAXSSIZ - (sz))
-#endif
 
 #define	USRIOSIZE		(8 * VAX_NPTEPG)	/* 512MB */
 #define	VM_PHYS_SIZE		(USRIOSIZE*VAX_NBPG)
diff --git a/sys/arch/vax/vax/pmap.c b/sys/arch/vax/vax/pmap.c
index 759c33c329f8..bcc65cd6094b 100644
--- a/sys/arch/vax/vax/pmap.c
+++ b/sys/arch/vax/vax/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.130 2003/11/06 00:32:27 he Exp $	   */
+/*	$NetBSD: pmap.c,v 1.131 2003/12/14 19:39:24 ragge Exp $	   */
 /*
  * Copyright (c) 1994, 1998, 1999, 2003 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.130 2003/11/06 00:32:27 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.131 2003/12/14 19:39:24 ragge Exp $");
 
 #include "opt_ddb.h"
 #include "opt_cputype.h"
@@ -279,11 +279,7 @@ pmap_bootstrap()
 
 	physmem = btoc(avail_end);
 
-#if USE_TOPDOWN_VM==1
 	usrptsize = (1024*1024*1024)/VAX_NBPG;	/* 1GB total VM */
-#else
-	usrptsize = PROCPTSIZE * maxproc;
-#endif
 	if (vax_btop(usrptsize)* PPTESZ > avail_end/20)
 		usrptsize = (avail_end/(20 * PPTESZ)) * VAX_NBPG;