kill old vm

7 files changed, 10 insertions, 91 deletions

diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index f6bd7f7c90f..e96f6ab71a7 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: buf.h,v 1.23 2001/06/22 14:10:59 deraadt Exp $	*/
+/*	$OpenBSD: buf.h,v 1.24 2001/06/27 04:51:47 art Exp $	*/
 /*	$NetBSD: buf.h,v 1.25 1997/04/09 21:12:17 mycroft Exp $	*/
 
 /*
@@ -194,10 +194,6 @@ struct	buf *buf;		/* The buffer headers. */
 char	*buffers;		/* The buffer contents. */
 int	bufpages;		/* Number of memory pages in the buffer pool. */
 int	nswbuf;			/* Number of swap I/O buffer headers. */
-#if !defined(UVM)
-struct	buf *swbuf;		/* Swap I/O buffer headers. */
-struct	buf bswlist;		/* Head of swap I/O buffer headers free list. */
-#endif
 
 __BEGIN_DECLS
 void	allocbuf __P((struct buf *, int));
diff --git a/sys/sys/lock.h b/sys/sys/lock.h
index b623e7e110d..5caf17fbfe7 100644
--- a/sys/sys/lock.h
+++ b/sys/sys/lock.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lock.h,v 1.5 1999/02/26 02:28:58 art Exp $	*/
+/*	$OpenBSD: lock.h,v 1.6 2001/06/27 04:51:48 art Exp $	*/
 
 /* 
  * Copyright (c) 1995
@@ -44,12 +44,11 @@
 
 #include <sys/simplelock.h>
 
-#if defined(UVM) /* XXXCDC: kill typedefs later? */
 typedef struct simplelock       simple_lock_data_t;
 typedef struct simplelock       *simple_lock_t;
 typedef struct lock             lock_data_t;
 typedef struct lock             *lock_t;
-#endif
+
 /*
  * The general lock structure.  Provides for multiple shared locks,
  * upgrading from shared to exclusive, and sleeping until the lock
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index 53497a42baf..b922f1777ef 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.h,v 1.43 2001/06/22 23:55:22 art Exp $	*/
+/*	$OpenBSD: proc.h,v 1.44 2001/06/27 04:51:48 art Exp $	*/
 /*	$NetBSD: proc.h,v 1.44 1996/04/22 01:23:21 christos Exp $	*/
 
 /*-
@@ -293,17 +293,10 @@ struct	pcred {
 		FREE(s, M_SESSION);					\
 }
 
-#if defined(UVM)
 #define	PHOLD(p) {							\
 	if ((p)->p_holdcnt++ == 0 && ((p)->p_flag & P_INMEM) == 0)	\
 		uvm_swapin(p);						\
 }
-#else
-#define	PHOLD(p) {							\
-	if ((p)->p_holdcnt++ == 0 && ((p)->p_flag & P_INMEM) == 0)	\
-		swapin(p);						\
-}
-#endif
 #define	PRELE(p)	(--(p)->p_holdcnt)
 
 /*
@@ -372,11 +365,7 @@ void	resetpriority __P((struct proc *));
 void	setrunnable __P((struct proc *));
 void	setrunqueue __P((struct proc *));
 void	sleep __P((void *chan, int pri));
-#if defined(UVM)
 void	uvm_swapin __P((struct proc *));  /* XXX: uvm_extern.h? */
-#else
-void	swapin __P((struct proc *));
-#endif
 int	tsleep __P((void *chan, int pri, char *wmesg, int timo));
 void	unsleep __P((struct proc *));
 void    wakeup_n __P((void *chan, int));
diff --git a/sys/sys/swap.h b/sys/sys/swap.h
index b121668d6e0..da79bb43cb1 100644
--- a/sys/sys/swap.h
+++ b/sys/sys/swap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: swap.h,v 1.3 2001/03/09 03:13:47 deraadt Exp $	*/
+/*	$OpenBSD: swap.h,v 1.4 2001/06/27 04:51:48 art Exp $	*/
 /*	$NetBSD: swap.h,v 1.2 1998/09/13 14:46:24 christos Exp $	*/
 
 /*
@@ -64,10 +64,4 @@ struct swapent {
 #define SWF_BUSY	0x00000004	/* busy: I/O happening here */
 #define SWF_FAKE	0x00000008	/* fake: still being built */
 
-#if defined(_KERNEL) && !defined(UVM)
-daddr_t swap_alloc __P((int size));
-void swap_free __P((int size, daddr_t addr));
-void swapinit __P((void));
-#endif
-
 #endif /* _SYS_SWAP_H_ */
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 9b6c1671cab..7cab4c0cd98 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: systm.h,v 1.39 2001/06/24 20:53:40 mickey Exp $	*/
+/*	$OpenBSD: systm.h,v 1.40 2001/06/27 04:51:49 art Exp $	*/
 /*	$NetBSD: systm.h,v 1.50 1996/06/09 04:55:09 briggs Exp $	*/
 
 /*-
@@ -81,10 +81,6 @@ extern int cold;		/* cold start flag initialized in locore */
 
 extern int nblkdev;		/* number of entries in bdevsw */
 extern int nchrdev;		/* number of entries in cdevsw */
-#if !defined(UVM)
-extern int nswdev;		/* number of swap devices */
-extern int nswap;		/* size of swap space */
-#endif
 
 extern int selwait;		/* select timeout address */
 
@@ -178,9 +174,7 @@ void	ttyprintf __P((struct tty *, const char *, ...))
 
 void	tablefull __P((const char *));
 
-#if defined(UVM)
 int	kcopy __P((const void *, void *, size_t));
-#endif
 
 void	bcopy __P((const void *, void *, size_t));
 void	ovbcopy __P((const void *, void *, size_t));
diff --git a/sys/sys/vmmeter.h b/sys/sys/vmmeter.h
index 608c5167978..b5ab626746a 100644
--- a/sys/sys/vmmeter.h
+++ b/sys/sys/vmmeter.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmmeter.h,v 1.10 2001/05/11 06:36:59 angelos Exp $	*/
+/*	$OpenBSD: vmmeter.h,v 1.11 2001/06/27 04:51:49 art Exp $	*/
 /*	$NetBSD: vmmeter.h,v 1.9 1995/03/26 20:25:04 jtc Exp $	*/
 
 /*-
@@ -43,57 +43,6 @@
  * System wide statistics counters.  Look in <uvm/uvm_extern.h> for the
  * UVM equivalent.
  */
-#if !defined(UVM)
-struct vmmeter {
-	/*
-	 * General system activity.
-	 */
-	u_int v_swtch;		/* context switches */
-	u_int v_trap;		/* calls to trap */
-	u_int v_syscall;	/* calls to syscall() */
-	u_int v_intr;		/* device interrupts */
-	u_int v_soft;		/* software interrupts */
-	u_int v_faults;		/* total faults taken */
-	/*
-	 * Virtual memory activity.
-	 */
-	u_int v_lookups;	/* object cache lookups */
-	u_int v_hits;		/* object cache hits */
-	u_int v_vm_faults;	/* number of address memory faults */
-	u_int v_cow_faults;	/* number of copy-on-writes */
-	u_int v_swpin;		/* swapins */
-	u_int v_swpout;		/* swapouts */
-	u_int v_pswpin;		/* pages swapped in */
-	u_int v_pswpout;	/* pages swapped out */
-	u_int v_pageins;	/* number of pageins */
-	u_int v_pageouts;	/* number of pageouts */
-	u_int v_pgpgin;		/* pages paged in */
-	u_int v_pgpgout;	/* pages paged out */
-	u_int v_intrans;	/* intransit blocking page faults */
-	u_int v_reactivated;	/* number of pages reactivated from free list */
-	u_int v_rev;		/* revolutions of the hand */
-	u_int v_scan;		/* scans in page out daemon */
-	u_int v_dfree;		/* pages freed by daemon */
-	u_int v_pfree;		/* pages freed by exiting processes */
-	u_int v_zfod;		/* pages zero filled on demand */
-	u_int v_nzfod;		/* number of zfod's created */
-	/*
-	 * Distribution of page usages.
-	 */
-	u_int v_page_size;	/* page size in bytes */
-	u_int v_kernel_pages;	/* number of pages in use by kernel */
-	u_int v_free_target;	/* number of pages desired free */
-	u_int v_free_min;	/* minimum number of pages desired free */
-	u_int v_free_count;	/* number of pages free */
-	u_int v_wire_count;	/* number of pages wired down */
-	u_int v_active_count;	/* number of pages active */
-	u_int v_inactive_target; /* number of pages desired inactive */
-	u_int v_inactive_count;  /* number of pages inactive */
-};
-#ifdef _KERNEL
-struct	vmmeter cnt;
-#endif
-#endif
 
 /* systemwide totals computed every five seconds */
 struct vmtotal
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index ee81b116e16..5153a37cc2a 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vnode.h,v 1.34 2001/06/22 14:11:01 deraadt Exp $	*/
+/*	$OpenBSD: vnode.h,v 1.35 2001/06/27 04:51:49 art Exp $	*/
 /*	$NetBSD: vnode.h,v 1.38 1996/02/29 20:59:05 cgd Exp $	*/
 
 /*
@@ -39,13 +39,13 @@
 #include <sys/queue.h>
 #include <sys/lock.h>
 #include <sys/select.h>
-#ifdef UVM			/* XXX: clean up includes later */
+
+/* XXX: clean up includes later */
 #include <vm/pglist.h>		/* XXX */
 #include <vm/vm_param.h>	/* XXX */
 #include <sys/lock.h>		/* XXX */
 #include <uvm/uvm_object.h>	/* XXX */
 #include <uvm/uvm_vnode.h>	/* XXX */
-#endif /* UVM */
 
 /*
  * The vnode is the focus of all file activity in UNIX.  There is a
@@ -87,9 +87,7 @@ LIST_HEAD(buflists, buf);
  */
 
 struct vnode {
-#ifdef UVM
 	struct uvm_vnode v_uvm;			/* uvm data */
-#endif
 	int	(**v_op) __P((void *));		/* vnode operations vector */
 	enum	vtype v_type;			/* vnode type */
 	u_int	v_flag;				/* vnode flags (see below) */