From 4c698e84f688cc6395baf56312a9f84ab43dc24f Mon Sep 17 00:00:00 2001 From: mrg Date: Mon, 26 Jun 2000 14:58:58 +0000 Subject: [PATCH] -> --- 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/{vm/vm_param.h => uvm/uvm_param.h} | 2 +- sys/vm/vm.h | 4 +- sys/vm/vm_kern.h | 78 ------------------------ 13 files changed, 22 insertions(+), 102 deletions(-) rename sys/{vm/vm_param.h => uvm/uvm_param.h} (98%) delete mode 100644 sys/vm/vm_kern.h diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi index 8ef7dcb3c7ef..ab893dec0185 100644 --- a/distrib/sets/lists/comp/mi +++ b/distrib/sets/lists/comp/mi @@ -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 --git a/sys/arch/arm26/arm26/copyinoutstr.c b/sys/arch/arm26/arm26/copyinoutstr.c index 370db98d670d..08d907568f6c 100644 --- a/sys/arch/arm26/arm26/copyinoutstr.c +++ b/sys/arch/arm26/arm26/copyinoutstr.c @@ -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 -__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 #include #include #include -#include +#include /* * FIXME: These are bogus. They should use LDRT and friends for user diff --git a/sys/arch/m68k/include/db_machdep.h b/sys/arch/m68k/include/db_machdep.h index 55c3256c36d0..855dbf65fc62 100644 --- a/sys/arch/m68k/include/db_machdep.h +++ b/sys/arch/m68k/include/db_machdep.h @@ -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 or someplace. */ -#include +#include #include #include diff --git a/sys/arch/macppc/dev/esp.c b/sys/arch/macppc/dev/esp.c index 19b4ccd44c6d..e3a67ed2efce 100644 --- a/sys/arch/macppc/dev/esp.c +++ b/sys/arch/macppc/dev/esp.c @@ -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 #include -#include /* for trunc_page */ +#include /* for trunc_page */ #include #include diff --git a/sys/arch/mips/include/db_machdep.h b/sys/arch/mips/include/db_machdep.h index bcd787cd7860..43a3471c6cd2 100644 --- a/sys/arch/mips/include/db_machdep.h +++ b/sys/arch/mips/include/db_machdep.h @@ -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 /* XXX boolean_t */ +#include /* XXX boolean_t */ #include /* T_BREAK */ #include /* register state */ #include /* symbolic register indices */ diff --git a/sys/arch/mips/mips/db_trace.c b/sys/arch/mips/mips/db_trace.c index d55566b9780e..8402404c77b5 100644 --- a/sys/arch/mips/mips/db_trace.c +++ b/sys/arch/mips/mips/db_trace.c @@ -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 -#include /* XXX boolean_t */ +#include /* XXX boolean_t */ #include diff --git a/sys/arch/mmeye/stand/bootcoff/osloader.c b/sys/arch/mmeye/stand/bootcoff/osloader.c index c3c6f33e5138..fd8047fa94fb 100644 --- a/sys/arch/mmeye/stand/bootcoff/osloader.c +++ b/sys/arch/mmeye/stand/bootcoff/osloader.c @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #define vm_page_size (NBPG) diff --git a/sys/arch/pc532/include/db_machdep.h b/sys/arch/pc532/include/db_machdep.h index c08df3f630b7..211f37953d86 100644 --- a/sys/arch/pc532/include/db_machdep.h +++ b/sys/arch/pc532/include/db_machdep.h @@ -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 #include -#include +#include #include /* For struct reg */ #include diff --git a/sys/arch/powerpc/include/db_machdep.h b/sys/arch/powerpc/include/db_machdep.h index 4bab6fbe2a3a..b1b7c3edd65c 100644 --- a/sys/arch/powerpc/include/db_machdep.h +++ b/sys/arch/powerpc/include/db_machdep.h @@ -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 #include -#include +#include #include #define DB_ELF_SYMBOLS diff --git a/sys/dev/isa/wt.c b/sys/dev/isa/wt.c index 013073031012..724323b56beb 100644 --- a/sys/dev/isa/wt.c +++ b/sys/dev/isa/wt.c @@ -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 #include -#include - #include #include #include diff --git a/sys/vm/vm_param.h b/sys/uvm/uvm_param.h similarity index 98% rename from sys/vm/vm_param.h rename to sys/uvm/uvm_param.h index ec87c6c28c95..121a227084c5 100644 --- a/sys/vm/vm_param.h +++ b/sys/uvm/uvm_param.h @@ -1,4 +1,4 @@ -/* $NetBSD: vm_param.h,v 1.26 2000/04/11 02:30:32 chs Exp $ */ +/* $NetBSD: uvm_param.h,v 1.1 2000/06/26 14:59:04 mrg Exp $ */ /* * Copyright (c) 1991, 1993 diff --git a/sys/vm/vm.h b/sys/vm/vm.h index 04e8214b3e76..18fe561407ce 100644 --- a/sys/vm/vm.h +++ b/sys/vm/vm.h @@ -1,4 +1,4 @@ -/* $NetBSD: vm.h,v 1.24 2000/06/26 14:21:19 mrg Exp $ */ +/* $NetBSD: vm.h,v 1.25 2000/06/26 15:03:02 mrg Exp $ */ /* * Copyright (c) 1991, 1993 @@ -55,7 +55,7 @@ typedef struct vm_page *vm_page_t; #include #include -#include +#include #include #include #include diff --git a/sys/vm/vm_kern.h b/sys/vm/vm_kern.h deleted file mode 100644 index 609223383105..000000000000 --- a/sys/vm/vm_kern.h +++ /dev/null @@ -1,78 +0,0 @@ -/* $NetBSD: vm_kern.h,v 1.13 2000/03/29 03:41:07 simonb 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_kern.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. - */ - -#ifndef _VM_VM_KERN_H_ -#define _VM_VM_KERN_H_ - -/* Kernel memory management definitions. */ - -extern vm_map_t buffer_map; -extern vm_map_t exec_map; -extern vm_map_t kernel_map; -extern vm_map_t kmem_map; -extern vm_map_t mb_map; -extern vm_map_t phys_map; -#endif /* !_VM_VM_KERN_H_ */