Kill vm/vm_param.h, move it to uvm/uvm_param.h

2 files changed, 2 insertions, 182 deletions

diff --git a/sys/vm/vm.h b/sys/vm/vm.h
index 5e6ee2aca77..0d035292cb8 100644
--- a/sys/vm/vm.h
+++ b/sys/vm/vm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm.h,v 1.20 2001/08/12 22:41:15 mickey Exp $	*/
+/*	$OpenBSD: vm.h,v 1.21 2001/11/06 00:30:38 art Exp $	*/
 /*	$NetBSD: vm.h,v 1.22 2000/03/26 20:54:48 kleink Exp $	*/
 
 /*
@@ -57,7 +57,7 @@ typedef struct vm_page  *vm_page_t;
 #include <sys/types.h>
 #include <sys/vmmeter.h>
 #include <sys/queue.h>
-#include <vm/vm_param.h>
+#include <uvm/uvm_param.h>
 #include <sys/lock.h>
 #include <uvm/uvm_extern.h>
 #include <vm/vm_page.h>
diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h
deleted file mode 100644
index 08aedd9e98e..00000000000
--- a/sys/vm/vm_param.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/*	$OpenBSD: vm_param.h,v 1.25 2001/08/11 10:57:22 art Exp $	*/
-/*	$NetBSD: vm_param.h,v 1.25 2000/03/26 20:42:45 kleink 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_param.h	8.2 (Berkeley) 1/9/95
- *
- *
- * 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.
- */
-
-/*
- *	Machine independent virtual memory parameters.
- */
-
-#ifndef	_VM_PARAM_
-#define	_VM_PARAM_
-
-#include <machine/vmparam.h>
-
-/*
- * This belongs in types.h, but breaks too many existing programs.
- */
-typedef	int	boolean_t;
-#ifndef TRUE
-#define	TRUE	1
-#endif
-#ifndef FALSE
-#define	FALSE	0
-#endif
-
-/*
- *	The machine independent pages are refered to as PAGES.  A page
- *	is some number of hardware pages, depending on the target machine.
- */
-#define	DEFAULT_PAGE_SIZE	4096
-
-#ifdef _KERNEL
-/*
- *	All references to the size of a page should be done with PAGE_SIZE
- *	or PAGE_SHIFT.
- *	We allow them to be constants in MD code, but when necessary
- *      (especially in LKMs) they will still be variables.
- */
-#if !defined(PAGE_SIZE) || defined(_LKM)
-/*
- * We undef those here to avoid problmes with LKMs.
- */
-#undef PAGE_SIZE
-#undef PAGE_MASK
-#undef PAGE_SHIFT
-#define	PAGE_SIZE	uvmexp.pagesize		/* size of page */
-#define	PAGE_MASK	uvmexp.pagemask		/* size of page - 1 */
-#define	PAGE_SHIFT	uvmexp.pageshift	/* bits to shift for pages */
-#endif /* !PAGE_SIZE */
-#endif /* _KERNEL */
-
-/*
- * CTL_VM identifiers
- */
-#define	VM_METER	1		/* struct vmmeter */
-#define	VM_LOADAVG	2		/* struct loadavg */
-#define	VM_PSSTRINGS	3		/* PSSTRINGS */
-#define VM_UVMEXP	4		/* struct uvmexp */
-#define VM_SWAPENCRYPT	5		/* int */
-#define VM_NKMEMPAGES	6		/* int - # kmem_map pages */
-#define	VM_MAXID	7		/* number of valid vm ids */
-
-#define	CTL_VM_NAMES { \
-	{ 0, 0 }, \
-	{ "vmmeter", CTLTYPE_STRUCT }, \
-	{ "loadavg", CTLTYPE_STRUCT }, \
-	{ "psstrings", CTLTYPE_STRUCT }, \
-	{ "uvmexp", CTLTYPE_STRUCT }, \
-	{ "swapencrypt", CTLTYPE_NODE }, \
-	{ "nkmempages", CTLTYPE_INT }, \
-}
-
-struct _ps_strings {
-	void	*val;
-};
-
-#define SWAPSKIPBYTES	8192	/* never use at the start of a swap space */
-
-/* 
- *	Return values from the VM routines.
- */
-#define	KERN_SUCCESS		0
-#define	KERN_INVALID_ADDRESS	1
-#define	KERN_PROTECTION_FAILURE	2
-#define	KERN_NO_SPACE		3
-#define	KERN_INVALID_ARGUMENT	4
-#define	KERN_FAILURE		5
-#define	KERN_RESOURCE_SHORTAGE	6
-#define	KERN_NOT_RECEIVER	7
-#define	KERN_NO_ACCESS		8
-#define	KERN_PAGES_LOCKED	9
-
-#ifndef ASSEMBLER
-/*
- *	Convert addresses to pages and vice versa.
- *	No rounding is used.
- */
-#ifdef _KERNEL
-#define	atop(x)		(((unsigned long)(x)) >> PAGE_SHIFT)
-#define	ptoa(x)		((vaddr_t)((x) << PAGE_SHIFT))
-
-/*
- * Round off or truncate to the nearest page.  These will work
- * for either addresses or counts (i.e., 1 byte rounds to 1 page).
- */
-#define	round_page(x) (((x) + PAGE_MASK) & ~PAGE_MASK)
-#define	trunc_page(x) ((x) & ~PAGE_MASK)
-#else
-/* out-of-kernel versions of round_page and trunc_page */
-#define	round_page(x) \
-	((((vaddr_t)(x) + (vm_page_size - 1)) / vm_page_size) * \
-	    vm_page_size)
-#define	trunc_page(x) \
-	((((vaddr_t)(x)) / vm_page_size) * vm_page_size)
-
-#endif /* _KERNEL */
-#endif /* ASSEMBLER */
-#endif /* _VM_PARAM_ */