From: Kirk McKusick <mckusick@ucbvax.Berkeley.EDU>
Date: Thu, 6 Dec 1990 11:57:52 +0000 (-0800)
Subject: update for new VM
X-Git-Tag: BSD-4_3_Reno-Snapshot-Development~76
X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/commitdiff_plain/c94cb9cc22a91b75c4a9f1d01026b32e4fd27eb5?hp=4534a6384a54be077783a5962e4857137ceca0eb

update for new VM

SCCS-vsn: sys/conf/param.c 7.15
SCCS-vsn: sys/conf/files 7.26
SCCS-vsn: sys/hp300/conf/files.hp300 7.5
---

diff --git a/usr/src/sys/conf/files b/usr/src/sys/conf/files
index 7e2f8eb48d..ed6e4899ce 100644
--- a/usr/src/sys/conf/files
+++ b/usr/src/sys/conf/files
@@ -8,8 +8,9 @@ kern/kern_exit.c	standard
 kern/kern_fork.c	standard
 kern/kern_kinfo.c	standard
 kern/kern_ktrace.c	standard
+kern/kern_lock.c	standard
 kern/kern_malloc.c	standard
-kern/kern_mman.c	standard
+kern/kern_physio.c	standard
 kern/kern_proc.c	standard
 kern/kern_prot.c	standard
 kern/kern_resource.c	standard
@@ -51,18 +52,23 @@ kern/uipc_socket.c	standard
 kern/uipc_socket2.c	standard
 kern/uipc_syscalls.c	standard
 kern/uipc_usrreq.c	standard
-kern/vm_drum.c		standard
-kern/vm_mem.c		standard
-kern/vm_mon.c		standard
-kern/vm_page.c		standard
-kern/vm_proc.c		standard
-kern/vm_pt.c		standard
-kern/vm_sched.c		standard
-kern/vm_subr.c		standard
-kern/vm_sw.c		standard
-kern/vm_swap.c		standard
-kern/vm_swp.c		standard
-kern/vm_text.c		standard
+vm/vm_fault.c		standard
+vm/vm_glue.c		standard
+vm/vm_init.c		standard
+vm/vm_kern.c		standard
+vm/vm_map.c		standard
+vm/vm_meter.c		standard
+vm/vm_mmap.c		standard
+vm/vm_object.c		standard
+vm/vm_pageout.c		standard
+vm/vm_pager.c		standard
+vm/vm_resident.c	standard
+vm/vm_swap.c		standard
+vm/vm_unix.c		standard
+vm/vm_user.c		standard
+vm/device_pager.c	optional devpager
+vm/swap_pager.c		optional swappager
+vm/vnode_pager.c	optional vnodepager
 ufs/ufs_alloc.c		standard
 ufs/ufs_bmap.c		standard
 ufs/ufs_disksubr.c	standard
diff --git a/usr/src/sys/conf/param.c b/usr/src/sys/conf/param.c
index e3922449a3..bb61aa652c 100644
--- a/usr/src/sys/conf/param.c
+++ b/usr/src/sys/conf/param.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)param.c	7.14 (Berkeley) %G%
+ *	@(#)param.c	7.15 (Berkeley) %G%
  */
 
 #ifndef lint
@@ -18,12 +18,10 @@ char copyright[] =
 #include "../sys/socket.h"
 #include "../sys/user.h"
 #include "../sys/proc.h"
-#include "../sys/text.h"
 #include "../sys/vnode.h"
 #include "../sys/file.h"
 #include "../sys/callout.h"
 #include "../sys/clist.h"
-#include "../sys/cmap.h"
 #include "../sys/mbuf.h"
 #include "../ufs/quota.h"
 #include "../sys/kernel.h"
@@ -51,8 +49,7 @@ int	tickadj = 240000 / (60 * HZ);		/* can adjust 240ms in 60s */
 struct	timezone tz = { TIMEZONE, DST };
 #define	NPROC (20 + 8 * MAXUSERS)
 int	nproc = NPROC;
-#define	NTEXT (36 + MAXUSERS)
-int	ntext = NTEXT;
+#define NTEXT 100			/* actually the object cache */
 #define NVNODE (NPROC + NTEXT + 300)
 long	desiredvnodes = NVNODE;
 int	nfile = 16 * (NPROC + 16 + MAXUSERS) / 10 + 32;
@@ -92,13 +89,11 @@ int	nbuf, nswbuf;
  * (if they've been externed everywhere else; hah!).
  */
 struct	proc *proc, *procNPROC;
-struct	text *text, *textNTEXT;
 struct	file *file, *fileNFILE;
 struct 	callout *callout;
 struct	cblock *cfree;
 struct	buf *buf, *swbuf;
 char	*buffers;
-struct	cmap *cmap, *ecmap;
 
 /*
  * Proc/pgrp hashing.
diff --git a/usr/src/sys/hp300/conf/files.hp300 b/usr/src/sys/hp300/conf/files.hp300
index ce8ea3881a..063096998b 100644
--- a/usr/src/sys/hp300/conf/files.hp300
+++ b/usr/src/sys/hp300/conf/files.hp300
@@ -4,10 +4,12 @@ hp300/conf.c		standard
 hp300/cons.c		standard
 hp300/dkbad.c		standard
 hp300/in_cksum.c	optional inet
+hp300/kgdb_stub.c	optional kgdb
 hp300/machdep.c		standard config-dependent
 hp300/mem.c		standard
 hp300/ns_cksum.c	optional ns
 hp300/oc_cksum.s	optional inet
+hp300/pmap.c		standard
 hp300/sys_machdep.c	standard
 hp300/trap.c		standard
 hp300/vm_machdep.c	standard