Retire sys/dmap.h by including the two lines of it which matters

directly in vm/vm_swap.c.

2 files changed, 3 insertions, 64 deletions

diff --git a/sys/sys/dmap.h b/sys/sys/dmap.h
deleted file mode 100644
index d9da387..0000000
--- a/sys/sys/dmap.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * 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.
- *
- *	@(#)dmap.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
- */
-
-#ifndef _SYS_DMAP_H_
-#define	_SYS_DMAP_H_
-
-typedef	int32_t	swblk_t;	/* swap offset */
-
-/*
- * Definitions for the mapping of vitual swap space to the physical swap
- * area - the disk map.
- */
-#define	NDMAP	38		/* size of the swap area map */
-
-struct dmap {
-	swblk_t dm_size;	/* current size used by process */
-	swblk_t dm_alloc;	/* amount of physical swap space allocated */
-	swblk_t dm_map[NDMAP];	/* first disk block number in each chunk */
-};
-#ifdef _KERNEL
-extern struct dmap zdmap;
-extern int dmmin, dmmax, dmtext;
-#endif
-
-/* The following structure is that ``returned'' from a call to vstodb(). */
-struct dblock {
-	swblk_t db_base;	/* base of physical contig drum block */
-	swblk_t db_size;	/* size of block */
-};
-#endif	/* !_SYS_DMAP_H_ */
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c
index 5e488c9..3f75289 100644
--- a/sys/vm/vm_swap.c
+++ b/sys/vm/vm_swap.c
@@ -45,7 +45,6 @@
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/namei.h>
-#include <sys/dmap.h>		/* XXX */
 #include <sys/vnode.h>
 #include <sys/fcntl.h>
 #include <sys/blist.h>
@@ -67,6 +66,9 @@
  * Indirect driver for multi-controller paging.
  */
 
+typedef	int32_t	swblk_t;	/* swap offset */
+extern int dmmax;
+
 #ifndef NSWAPDEV
 #define NSWAPDEV	4
 #endif