remove <vm/vm_swap.h> and <vm/vm_conf.h>

This commit is contained in:
mrg 2000-04-15 18:08:12 +00:00
parent 450dc64ed8
commit 6b7f13609a
4 changed files with 7 additions and 54 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_swap.c,v 1.35 2000/04/07 08:27:28 chs Exp $ */
/* $NetBSD: uvm_swap.c,v 1.36 2000/04/15 18:08:14 mrg Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Matthew R. Green
@ -38,6 +38,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
#include <sys/conf.h>
#include <sys/proc.h>
#include <sys/namei.h>
#include <sys/disklabel.h>
@ -53,8 +54,6 @@
#include <sys/swap.h>
#include <vm/vm.h>
#include <vm/vm_conf.h>
#include <uvm/uvm.h>
#include <miscfs/specfs/specdev.h>
@ -216,6 +215,9 @@ struct pool *vndbuf_pool;
pool_put(vndbuf_pool, (void *)(vbp)); \
}
/* /dev/drum */
bdev_decl(sw);
cdev_decl(sw);
/*
* local variables

View File

@ -1,13 +1,10 @@
# $NetBSD: Makefile,v 1.3 1999/03/30 13:08:55 mycroft Exp $
# $NetBSD: Makefile,v 1.4 2000/04/15 18:08:12 mrg Exp $
KDIR= /sys/vm
INCSDIR= /usr/include/vm
INCS= pglist.h pmap.h vm.h vm_conf.h \
INCS= pglist.h pmap.h vm.h \
vm_extern.h vm_inherit.h vm_kern.h vm_map.h vm_object.h vm_page.h \
vm_pageout.h vm_pager.h vm_param.h vm_prot.h
# XXX remove after NetBSD 1.4 (or earlier if you want :)
INCS+= vm_swap.h
.include <bsd.kinc.mk>

View File

@ -1,42 +0,0 @@
/* $NetBSD: vm_conf.h,v 1.3 1998/09/13 13:21:37 christos Exp $ */
/*-
* Copyright (c) 1995 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Christos Zoulas.
*
* 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 NetBSD
* Foundation, Inc. and its contributors.
* 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
*/
#include <sys/conf.h>
bdev_decl(sw);
cdev_decl(sw);

View File

@ -1,4 +0,0 @@
/* $NetBSD: vm_swap.h,v 1.10 1998/08/29 17:01:15 mrg Exp $ */
/* <vm/vm_swap.h> is deprecated */
#include <sys/swap.h>