From 220741c64f2259118a38df96becb40128b4d6b0f Mon Sep 17 00:00:00 2001
From: Kirk McKusick <mckusick@ucbvax.Berkeley.EDU>
Date: Sat, 6 Jun 1987 20:25:28 -0800
Subject: [PATCH] camap is replaced by kmempt

SCCS-vsn: sys/tahoe/tahoe/locore.s 1.17
SCCS-vsn: sys/sys/map.h 7.2
---
 usr/src/sys/sys/map.h            |  3 ++-
 usr/src/sys/tahoe/tahoe/locore.s | 21 ++++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/usr/src/sys/sys/map.h b/usr/src/sys/sys/map.h
index 83046ad1e4..64f390442e 100644
--- a/usr/src/sys/sys/map.h
+++ b/usr/src/sys/sys/map.h
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
- *	@(#)map.h	7.1 (Berkeley) %G%
+ *	@(#)map.h	7.2 (Berkeley) %G%
  */
 
 /*
@@ -47,4 +47,5 @@ struct	map *argmap;
 #define	ARGMAPSIZE	16
 struct	map *kernelmap;
 struct	map *mbmap;
+struct	map *kmemmap;
 #endif
diff --git a/usr/src/sys/tahoe/tahoe/locore.s b/usr/src/sys/tahoe/tahoe/locore.s
index 994f0ccdf4..17c38afa1f 100644
--- a/usr/src/sys/tahoe/tahoe/locore.s
+++ b/usr/src/sys/tahoe/tahoe/locore.s
@@ -1,4 +1,4 @@
-/*	locore.s	1.16	87/06/04	*/
+/*	locore.s	1.17	87/06/06	*/
 
 #include "../tahoe/mtpr.h"
 #include "../tahoe/trap.h"
@@ -601,16 +601,27 @@ _/**/mname:	.globl	_/**/mname;		\
 	SYSMAP(alignmap	,alignutl	,1		)	/* XXX */
 	SYSMAP(msgbufmap,msgbuf		,MSGBUFPTECNT	)
 	SYSMAP(Mbmap	,mbutl		,NMBCLUSTERS*CLSIZE+CLSIZE )
-	SYSMAP(camap	,cabase		,(VBPTSIZE+16)*CLSIZE )
+	SYSMAP(kmempt	,kmembase	,100*CLSIZE 	)
 #ifdef	GPROF
 	SYSMAP(profmap	,profbase	,600*CLSIZE	)
 #endif
-	SYSMAP(ecamap	,calimit	,0		)
+	/*
+	 * Enlarge kmempt as needed for bounce buffers allocated
+	 * by tahoe controllers.
+	 */
+#include "dk.h"
+	SYSMAP(_vdmap	,_vdbase	,NVD*MAXPHYS/NBPG+CLSIZE )
+#include "yc.h"
+	SYSMAP(_cymap	,_cybase	,NCY*MAXPHYS/NBPG+CLSIZE )
+	SYSMAP(ekmempt	,kmemlimit	,0		)
 	SYSMAP(VMEMbeg	,vmembeg	,0		)
 	SYSMAP(VMEMmap	,vmem		,VBIOSIZE 	)
-	SYSMAP(VMEMmap1	,vmem1		,VBMEMSIZE	)
+	SYSMAP(VMEMmap1	,vmem1		,0		)
+#include "ace.h"
+	SYSMAP(_acemap1	,_acemem	,NACE*32	)
 	SYSMAP(VMEMend	,vmemend	,0		)
-	SYSMAP(VBmap	,vbbase		,VBPTSIZE	)
+	SYSMAP(VBmap	,vbbase		,0		)
+	SYSMAP(_vdbmap	,_vdbbase	,NVD*MAXPHYS/NBPG+CLSIZE )
 	SYSMAP(eVBmap	,vbend		,0		)
 	SYSMAP(Usrptmap	,usrpt		,USRPTSIZE+CLSIZE )
 eSysmap:
-- 
2.20.1