vm_extern.h no more

5 files changed, 19 insertions, 71 deletions

diff --git a/sys/arch/sun3/sun3/kgdb_stub.c b/sys/arch/sun3/sun3/kgdb_stub.c
index 289c12ddeaa..432be3fb19e 100644
--- a/sys/arch/sun3/sun3/kgdb_stub.c
+++ b/sys/arch/sun3/sun3/kgdb_stub.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kgdb_stub.c,v 1.5 1997/01/16 04:04:25 kstailey Exp $	*/
+/*	$OpenBSD: kgdb_stub.c,v 1.6 2001/08/12 20:18:30 mickey Exp $	*/
 /*	$NetBSD: kgdb_stub.c,v 1.6 1996/10/23 16:30:48 gwr Exp $	*/
 
 /*
@@ -53,7 +53,6 @@
 #include <sys/systm.h>
 
 #include <vm/vm.h>
-#include <vm/vm_extern.h>
 
 #include <machine/control.h>
 #include <machine/cpu.h>
diff --git a/sys/ufs/lfs/lfs_balloc.c b/sys/ufs/lfs/lfs_balloc.c
index fd01e01adbf..9753c4372d7 100644
--- a/sys/ufs/lfs/lfs_balloc.c
+++ b/sys/ufs/lfs/lfs_balloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lfs_balloc.c,v 1.5 1997/05/30 08:34:36 downsj Exp $	*/
+/*	$OpenBSD: lfs_balloc.c,v 1.6 2001/08/12 20:18:30 mickey Exp $	*/
 /*	$NetBSD: lfs_balloc.c,v 1.3 1996/02/09 22:28:48 christos Exp $	*/
 
 /*
@@ -55,7 +55,6 @@
 #include <ufs/lfs/lfs_extern.h>
 
 #include <vm/vm.h>
-#include <vm/vm_extern.h>	/* for vnode_pager_setsize() */
 
 int lfs_fragextend __P((struct vnode *vp, int osize, int nsize, daddr_t lbn,
 	struct buf **bpp));
diff --git a/sys/uvm/uvm_extern.h b/sys/uvm/uvm_extern.h
index b66f85b4c3c..acb65009c06 100644
--- a/sys/uvm/uvm_extern.h
+++ b/sys/uvm/uvm_extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_extern.h,v 1.20 2001/08/12 05:18:41 mickey Exp $	*/
+/*	$OpenBSD: uvm_extern.h,v 1.21 2001/08/12 20:18:30 mickey Exp $	*/
 /*	$NetBSD: uvm_extern.h,v 1.42 2000/06/08 05:52:34 thorpej Exp $	*/
 
 /*
@@ -175,6 +175,7 @@ typedef int		vm_prot_t;
  * structures
  */
 
+struct buf;
 struct core;
 struct mount;
 struct pglist;
@@ -446,6 +447,19 @@ void			kmeminit_nkmempages __P((void));
 void			kmeminit __P((void));
 extern int		nkmempages;
 
-#endif /* _KERNEL */
+void		swstrategy __P((struct buf *));
 
+/* Machine dependent portion */
+void		vmapbuf __P((struct buf *, vsize_t));
+void		vunmapbuf __P((struct buf *, vsize_t));
+void		pagemove __P((caddr_t, caddr_t, size_t));
+void		cpu_fork __P((struct proc *, struct proc *, void *, size_t));
+#ifndef	cpu_swapin
+void		cpu_swapin __P((struct proc *));
+#endif
+#ifndef	cpu_swapout
+void		cpu_swapout __P((struct proc *));
+#endif
+
+#endif /* _KERNEL */
 #endif /* _UVM_UVM_EXTERN_H_ */
diff --git a/sys/vm/vm.h b/sys/vm/vm.h
index cde7a9ebd8c..71326c3ef62 100644
--- a/sys/vm/vm.h
+++ b/sys/vm/vm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm.h,v 1.16 2001/08/12 05:18:42 mickey Exp $	*/
+/*	$OpenBSD: vm.h,v 1.17 2001/08/12 20:18:30 mickey Exp $	*/
 /*	$NetBSD: vm.h,v 1.22 2000/03/26 20:54:48 kleink Exp $	*/
 
 /*
@@ -65,7 +65,6 @@ typedef struct vm_page  *vm_page_t;
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>
 #include <vm/pmap.h>
-#include <vm/vm_extern.h>
 
 /*
  * Shareable process virtual address space.
diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h
deleted file mode 100644
index aa5976c9e95..00000000000
--- a/sys/vm/vm_extern.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$OpenBSD: vm_extern.h,v 1.23 2001/07/05 07:24:10 art Exp $	*/
-/*	$NetBSD: vm_extern.h,v 1.20 1996/04/23 12:25:23 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)vm_extern.h	8.5 (Berkeley) 5/3/95
- */
-
-struct buf;
-struct loadavg;
-struct proc;
-struct vmspace;
-struct vmtotal;
-struct mount;
-struct vnode;
-struct core;
-
-#ifdef _KERNEL
-void		swstrategy __P((struct buf *));
-
-/* Machine dependent portion */
-void		vmapbuf __P((struct buf *, vsize_t));
-void		vunmapbuf __P((struct buf *, vsize_t));
-void		pagemove __P((caddr_t, caddr_t, size_t));
-void		cpu_fork __P((struct proc *, struct proc *, void *, size_t));
-#ifndef	cpu_swapin
-void		cpu_swapin __P((struct proc *));
-#endif
-#ifndef	cpu_swapout
-void		cpu_swapout __P((struct proc *));
-#endif
-
-#endif