vm_inherit.h no more

6 files changed, 19 insertions, 95 deletions

diff --git a/sys/arch/mvme88k/include/db_machdep.h b/sys/arch/mvme88k/include/db_machdep.h
index eeb8b0911ce..e864333d4c3 100644
--- a/sys/arch/mvme88k/include/db_machdep.h
+++ b/sys/arch/mvme88k/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.9 2001/08/12 20:13:07 miod Exp $ */
+/*	$OpenBSD: db_machdep.h,v 1.10 2001/08/12 21:00:14 mickey Exp $ */
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -38,7 +38,6 @@
 
 #include <sys/types.h>
 #include <vm/vm_param.h>
-#include <vm/vm_inherit.h>
 #include <uvm/uvm_extern.h>
 #include <machine/pcb.h>	/* m88100_saved_state */
 #include <machine/psl.h>
diff --git a/sys/arch/mvmeppc/include/db_machdep.h b/sys/arch/mvmeppc/include/db_machdep.h
index 0140b64d6ea..dfbeb144a8a 100644
--- a/sys/arch/mvmeppc/include/db_machdep.h
+++ b/sys/arch/mvmeppc/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.2 2001/08/12 20:43:38 mickey Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.3 2001/08/12 21:00:14 mickey Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.13 1996/04/29 20:50:08 leo Exp $	*/
 
 /* 
@@ -33,8 +33,8 @@
 #ifndef	_PPC_DB_MACHDEP_H_
 #define	_PPC_DB_MACHDEP_H_
 
+#include <sys/types.h>
 #include <vm/vm_param.h>
-#include <vm/vm_inherit.h>
 #include <uvm/uvm_extern.h>
 #include <machine/trap.h>
 
diff --git a/sys/arch/powerpc/include/db_machdep.h b/sys/arch/powerpc/include/db_machdep.h
index 84758876060..1258e47284c 100644
--- a/sys/arch/powerpc/include/db_machdep.h
+++ b/sys/arch/powerpc/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.11 2001/08/12 16:09:19 drahn Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.12 2001/08/12 21:00:14 mickey Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.13 1996/04/29 20:50:08 leo Exp $	*/
 
 /*
@@ -33,8 +33,9 @@
 #ifndef	_PPC_DB_MACHDEP_H_
 #define	_PPC_DB_MACHDEP_H_
 
+#include <sys/types.h>
 #include <vm/vm_param.h>
-#include <vm/vm_inherit.h>
+#include <uvm/uvm_extern.h>
 #include <machine/trap.h>
 
 #define DB_MACHINE_COMMANDS
diff --git a/sys/uvm/uvm_extern.h b/sys/uvm/uvm_extern.h
index acb65009c06..c346aed8fd9 100644
--- a/sys/uvm/uvm_extern.h
+++ b/sys/uvm/uvm_extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_extern.h,v 1.21 2001/08/12 20:18:30 mickey Exp $	*/
+/*	$OpenBSD: uvm_extern.h,v 1.22 2001/08/12 21:00:14 mickey Exp $	*/
 /*	$NetBSD: uvm_extern.h,v 1.42 2000/06/08 05:52:34 thorpej Exp $	*/
 
 /*
@@ -117,6 +117,17 @@ typedef int		vm_prot_t;
 
 #define VM_PROT_ALL	(VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE)
 
+/*
+ *	Enumeration of valid values for vm_inherit_t.
+ */
+
+#define	VM_INHERIT_SHARE	((vm_inherit_t)0)	/* share with child */
+#define	VM_INHERIT_COPY		((vm_inherit_t)1)	/* copy into child */
+#define	VM_INHERIT_NONE		((vm_inherit_t)2)	/* absent from child */
+#define	VM_INHERIT_DONATE_COPY	((vm_inherit_t)3)	/* copy and delete */
+
+#define VM_INHERIT_DEFAULT	VM_INHERIT_COPY
+
 /* advice: matches MADV_* from sys/mman.h */
 #define UVM_ADV_NORMAL	0x0	/* 'normal' */
 #define UVM_ADV_RANDOM	0x1	/* 'random' */
diff --git a/sys/vm/vm.h b/sys/vm/vm.h
index 71326c3ef62..b04a52afeb4 100644
--- a/sys/vm/vm.h
+++ b/sys/vm/vm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm.h,v 1.17 2001/08/12 20:18:30 mickey Exp $	*/
+/*	$OpenBSD: vm.h,v 1.18 2001/08/12 21:00:15 mickey Exp $	*/
 /*	$NetBSD: vm.h,v 1.22 2000/03/26 20:54:48 kleink Exp $	*/
 
 /*
@@ -59,7 +59,6 @@ typedef struct vm_page  *vm_page_t;
 #include <sys/queue.h>
 #include <vm/vm_param.h>
 #include <sys/lock.h>
-#include <vm/vm_inherit.h>
 #include <uvm/uvm_extern.h>
 #include <vm/vm_map.h>
 #include <vm/vm_page.h>
diff --git a/sys/vm/vm_inherit.h b/sys/vm/vm_inherit.h
deleted file mode 100644
index 7c7bc873106..00000000000
--- a/sys/vm/vm_inherit.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*	$OpenBSD: vm_inherit.h,v 1.4 2000/03/15 14:14:33 art Exp $	*/
-/*	$NetBSD: vm_inherit.h,v 1.7 1994/06/29 06:47:58 cgd Exp $	*/
-
-/* 
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * The Mach Operating System project at Carnegie-Mellon University.
- *
- * 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_inherit.h	8.1 (Berkeley) 6/11/93
- *
- *
- * Copyright (c) 1987, 1990 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Authors: Avadis Tevanian, Jr., Michael Wayne Young
- * 
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
-
-/*
- *	Virtual memory map inheritance definitions.
- */
-
-#ifndef	_VM_INHERIT_
-#define	_VM_INHERIT_
-
-/*
- *	Enumeration of valid values for vm_inherit_t.
- */
-
-#define	VM_INHERIT_SHARE	((vm_inherit_t)0)	/* share with child */
-#define	VM_INHERIT_COPY		((vm_inherit_t)1)	/* copy into child */
-#define	VM_INHERIT_NONE		((vm_inherit_t)2)	/* absent from child */
-#define	VM_INHERIT_DONATE_COPY	((vm_inherit_t)3)	/* copy and delete */
-
-#define VM_INHERIT_DEFAULT	VM_INHERIT_COPY
-
-#endif /* _VM_INHERIT_ */