Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src <vm/vm_param.h> -> <uvm/uvm_param.h>
details: https://anonhg.NetBSD.org/src/rev/be34242c19fe
branches: trunk
changeset: 493870:be34242c19fe
user: mrg <mrg%NetBSD.org@localhost>
date: Mon Jun 26 14:58:58 2000 +0000
description:
<vm/vm_param.h> -> <uvm/uvm_param.h>
diffstat:
distrib/sets/lists/comp/mi | 4 +-
sys/arch/arm26/arm26/copyinoutstr.c | 6 +-
sys/arch/m68k/include/db_machdep.h | 4 +-
sys/arch/macppc/dev/esp.c | 4 +-
sys/arch/mips/include/db_machdep.h | 4 +-
sys/arch/mips/mips/db_trace.c | 4 +-
sys/arch/mmeye/stand/bootcoff/osloader.c | 2 +-
sys/arch/pc532/include/db_machdep.h | 4 +-
sys/arch/powerpc/include/db_machdep.h | 4 +-
sys/dev/isa/wt.c | 4 +-
sys/uvm/uvm_param.h | 164 +++++++++++++++++++++++++++++++
sys/vm/vm.h | 4 +-
sys/vm/vm_kern.h | 78 --------------
sys/vm/vm_param.h | 164 -------------------------------
14 files changed, 185 insertions(+), 265 deletions(-)
diffs (truncated from 625 to 300 lines):
diff -r 73635f8ab478 -r be34242c19fe distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi Mon Jun 26 14:38:50 2000 +0000
+++ b/distrib/sets/lists/comp/mi Mon Jun 26 14:58:58 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.235 2000/06/26 14:20:25 mrg Exp $
+# $NetBSD: mi,v 1.236 2000/06/26 14:59:05 mrg Exp $
./sys comp-sysutil-root
./usr/bin/addr2line comp-miscutil-bin
./usr/bin/ar comp-util-bin
@@ -1121,6 +1121,7 @@
./usr/include/uvm/uvm_page_i.h comp-c-include
./usr/include/uvm/uvm_pager.h comp-c-include
./usr/include/uvm/uvm_pager_i.h comp-c-include
+./usr/include/uvm/uvm_param.h comp-c-include
./usr/include/uvm/uvm_pdaemon.h comp-c-include
./usr/include/uvm/uvm_pglist.h comp-c-include
./usr/include/uvm/uvm_prot.h comp-c-include
@@ -1134,7 +1135,6 @@
./usr/include/vm/vm_extern.h comp-c-include
./usr/include/vm/vm_map.h comp-c-include
./usr/include/vm/vm_page.h comp-c-include
-./usr/include/vm/vm_param.h comp-c-include
./usr/include/wchar.h comp-c-include
./usr/include/zconf.h comp-c-include
./usr/include/zlib.h comp-c-include
diff -r 73635f8ab478 -r be34242c19fe sys/arch/arm26/arm26/copyinoutstr.c
--- a/sys/arch/arm26/arm26/copyinoutstr.c Mon Jun 26 14:38:50 2000 +0000
+++ b/sys/arch/arm26/arm26/copyinoutstr.c Mon Jun 26 14:58:58 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: copyinoutstr.c,v 1.1 2000/05/09 21:55:55 bjh21 Exp $ */
+/* $NetBSD: copyinoutstr.c,v 1.2 2000/06/26 14:59:03 mrg Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
@@ -33,13 +33,13 @@
#include <sys/param.h>
-__RCSID("$NetBSD: copyinoutstr.c,v 1.1 2000/05/09 21:55:55 bjh21 Exp $");
+__RCSID("$NetBSD: copyinoutstr.c,v 1.2 2000/06/26 14:59:03 mrg Exp $");
#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/user.h>
#include <machine/pcb.h>
-#include <vm/vm_param.h>
+#include <uvm/uvm_param.h>
/*
* FIXME: These are bogus. They should use LDRT and friends for user
diff -r 73635f8ab478 -r be34242c19fe sys/arch/m68k/include/db_machdep.h
--- a/sys/arch/m68k/include/db_machdep.h Mon Jun 26 14:38:50 2000 +0000
+++ b/sys/arch/m68k/include/db_machdep.h Mon Jun 26 14:58:58 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.21 1998/09/02 11:16:34 leo Exp $ */
+/* $NetBSD: db_machdep.h,v 1.22 2000/06/26 14:59:01 mrg Exp $ */
/*
* Mach Operating System
@@ -38,7 +38,7 @@
* XXX - Would rather not pull in vm headers, but need boolean_t,
* at least until boolean_t moves to <sys/types.h> or someplace.
*/
-#include <vm/vm_param.h>
+#include <uvm/uvm_param.h>
#include <machine/frame.h>
#include <machine/psl.h>
diff -r 73635f8ab478 -r be34242c19fe sys/arch/macppc/dev/esp.c
--- a/sys/arch/macppc/dev/esp.c Mon Jun 26 14:38:50 2000 +0000
+++ b/sys/arch/macppc/dev/esp.c Mon Jun 26 14:58:58 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: esp.c,v 1.10 2000/06/05 07:59:51 nisimura Exp $ */
+/* $NetBSD: esp.c,v 1.11 2000/06/26 14:59:03 mrg Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -89,7 +89,7 @@
#include <sys/queue.h>
#include <sys/malloc.h>
-#include <vm/vm_param.h> /* for trunc_page */
+#include <uvm/uvm_param.h> /* for trunc_page */
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff -r 73635f8ab478 -r be34242c19fe sys/arch/mips/include/db_machdep.h
--- a/sys/arch/mips/include/db_machdep.h Mon Jun 26 14:38:50 2000 +0000
+++ b/sys/arch/mips/include/db_machdep.h Mon Jun 26 14:58:58 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.8 1999/04/10 15:10:56 drochner Exp $ */
+/* $NetBSD: db_machdep.h,v 1.9 2000/06/26 14:59:02 mrg Exp $ */
/*
* Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author)
@@ -34,7 +34,7 @@
#ifndef _MIPS_DB_MACHDEP_H_
#define _MIPS_DB_MACHDEP_H_
-#include <vm/vm_param.h> /* XXX boolean_t */
+#include <uvm/uvm_param.h> /* XXX boolean_t */
#include <mips/trap.h> /* T_BREAK */
#include <mips/reg.h> /* register state */
#include <mips/regnum.h> /* symbolic register indices */
diff -r 73635f8ab478 -r be34242c19fe sys/arch/mips/mips/db_trace.c
--- a/sys/arch/mips/mips/db_trace.c Mon Jun 26 14:38:50 2000 +0000
+++ b/sys/arch/mips/mips/db_trace.c Mon Jun 26 14:58:58 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.14 2000/05/27 02:18:12 enami Exp $ */
+/* $NetBSD: db_trace.c,v 1.15 2000/06/26 14:59:03 mrg Exp $ */
/*
* Mach Operating System
@@ -27,7 +27,7 @@
*/
#include <sys/param.h>
-#include <vm/vm_param.h> /* XXX boolean_t */
+#include <uvm/uvm_param.h> /* XXX boolean_t */
#include <mips/mips_opcode.h>
diff -r 73635f8ab478 -r be34242c19fe sys/arch/mmeye/stand/bootcoff/osloader.c
--- a/sys/arch/mmeye/stand/bootcoff/osloader.c Mon Jun 26 14:38:50 2000 +0000
+++ b/sys/arch/mmeye/stand/bootcoff/osloader.c Mon Jun 26 14:58:58 2000 +0000
@@ -34,7 +34,7 @@
#include <sys/sysctl.h>
#include <sys/socket.h>
#include <sys/file.h>
-#include <vm/vm_param.h>
+#include <uvm/uvm_param.h>
#include <machine/cpu.h>
#define vm_page_size (NBPG)
diff -r 73635f8ab478 -r be34242c19fe sys/arch/pc532/include/db_machdep.h
--- a/sys/arch/pc532/include/db_machdep.h Mon Jun 26 14:38:50 2000 +0000
+++ b/sys/arch/pc532/include/db_machdep.h Mon Jun 26 14:58:58 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.11 2000/06/26 14:20:53 mrg Exp $ */
+/* $NetBSD: db_machdep.h,v 1.12 2000/06/26 14:59:02 mrg Exp $ */
/*
* Mach Operating System
@@ -49,7 +49,7 @@
#include <uvm/uvm_prot.h>
#include <uvm/uvm_inherit.h>
-#include <vm/vm_param.h>
+#include <uvm/uvm_param.h>
#include <machine/reg.h> /* For struct reg */
#include <machine/psl.h>
diff -r 73635f8ab478 -r be34242c19fe sys/arch/powerpc/include/db_machdep.h
--- a/sys/arch/powerpc/include/db_machdep.h Mon Jun 26 14:38:50 2000 +0000
+++ b/sys/arch/powerpc/include/db_machdep.h Mon Jun 26 14:58:58 2000 +0000
@@ -1,5 +1,5 @@
/* $OpenBSD: db_machdep.h,v 1.2 1997/03/21 00:48:48 niklas Exp $ */
-/* $NetBSD: db_machdep.h,v 1.6 2000/06/26 14:20:54 mrg Exp $ */
+/* $NetBSD: db_machdep.h,v 1.7 2000/06/26 14:59:02 mrg Exp $ */
/*
* Mach Operating System
@@ -36,7 +36,7 @@
#include <uvm/uvm_prot.h>
#include <uvm/uvm_inherit.h>
-#include <vm/vm_param.h>
+#include <uvm/uvm_param.h>
#include <machine/trap.h>
#define DB_ELF_SYMBOLS
diff -r 73635f8ab478 -r be34242c19fe sys/dev/isa/wt.c
--- a/sys/dev/isa/wt.c Mon Jun 26 14:38:50 2000 +0000
+++ b/sys/dev/isa/wt.c Mon Jun 26 14:58:58 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wt.c,v 1.49 2000/03/23 07:01:36 thorpej Exp $ */
+/* $NetBSD: wt.c,v 1.50 2000/06/26 14:59:04 mrg Exp $ */
/*
* Streamer tape driver.
@@ -63,8 +63,6 @@
#include <sys/proc.h>
#include <sys/conf.h>
-#include <vm/vm_param.h>
-
#include <machine/intr.h>
#include <machine/bus.h>
#include <machine/pio.h>
diff -r 73635f8ab478 -r be34242c19fe sys/uvm/uvm_param.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/uvm/uvm_param.h Mon Jun 26 14:58:58 2000 +0000
@@ -0,0 +1,164 @@
+/* $NetBSD: uvm_param.h,v 1.1 2000/06/26 14:59:04 mrg 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@localhost
+ * 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
+
+#if defined(_KERNEL) && !defined(PAGE_SIZE)
+/*
+ * All references to the size of a page should be done with PAGE_SIZE
+ * or PAGE_SHIFT. The fact they are variables is hidden here so that
+ * we can easily make them constant if we so desire.
+ */
+#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 /* _KERNEL */
+
+/*
+ * CTL_VM identifiers
+ */
+#define VM_METER 1 /* struct vmmeter */
Home |
Main Index |
Thread Index |
Old Index