Removed unimplemented subr_rmap.c and unused references to it.

4 files changed, 3 insertions, 58 deletions

diff --git a/sys/conf/files b/sys/conf/files
index 1a2fbc3..035f17a 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -64,7 +64,6 @@ kern/subr_log.c		standard
 kern/subr_prf.c		standard
 kern/subr_prof.c	standard
 kern/subr_rlist.c	standard
-kern/subr_rmap.c	standard
 kern/subr_xxx.c		standard
 kern/sys_generic.c	standard
 kern/sys_process.c	standard
diff --git a/sys/sys/map.h b/sys/sys/map.h
index 1254660..7c793a3 100644
--- a/sys/sys/map.h
+++ b/sys/sys/map.h
@@ -36,35 +36,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)map.h	8.3 (Berkeley) 1/26/94
- * $Id: map.h,v 1.2 1994/08/02 07:53:11 davidg Exp $
+ * $Id: map.h,v 1.3 1994/08/21 04:41:50 paul Exp $
  */
 
 #ifndef _SYS_MAP_H_
 #define _SYS_MAP_H_
 
-/*
- * Resource allocation maps.
- *
- * Associated routines manage sub-allocation of an address space using
- * an array of segment descriptors.  The first element of this array
- * is a map structure, describing the arrays extent and the name
- * of the controlled object.  Each additional structure represents
- * a free segment of the address space.
- *
- * A call to rminit initializes a resource map and may also be used
- * to free some address space for the map.  Subsequent calls to rmalloc
- * and rmfree allocate and free space in the resource map.  If the resource
- * map becomes too fragmented to be described in the available space,
- * then some of the resource is discarded.  This may lead to critical
- * shortages, but is better than not checking (as the previous versions
- * of these routines did) or giving up and calling panic().  The routines
- * could use linked lists and call a memory allocator when they run
- * out of space, but that would not solve the out of space problem when
- * called at interrupt time.
- *
- * N.B.: The address 0 in the resource address space is not available
- * as it is used internally by the resource map routines.
- */
 struct map {
 	struct	mapent *m_limit;	/* address of last slot in map */
 	char	*m_name;		/* name of resource, for messages */
@@ -79,10 +56,6 @@ struct mapent {
 #define	ARGMAPSIZE	16
 struct	map *kmemmap, *mbmap, *swapmap;
 int	nswapmap;
-
-long	rmalloc __P((struct map *, long));
-void	rmfree __P((struct map *, long, long));
-void	rminit __P((struct map *, long, long, char *, int));
 #endif
 
 #endif
diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c
index dc7039b..10dd701 100644
--- a/sys/ufs/mfs/mfs_vnops.c
+++ b/sys/ufs/mfs/mfs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_vnops.c	8.3 (Berkeley) 9/21/93
- * $Id: mfs_vnops.c,v 1.4 1994/09/12 11:38:28 davidg Exp $
+ * $Id: mfs_vnops.c,v 1.5 1994/09/21 03:47:43 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -349,9 +349,5 @@ mfs_badop()
 int
 mfs_init()
 {
-
-#if !defined(hp300) && !defined(i386) && !defined(mips) && !defined(sparc) && !defined(luna68k)
-	rminit(mfsmap, (long)MFS_MAPREG, (long)1, "mfs mapreg", MFS_MAPSIZE);
-#endif
 	return (0);
 }
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c
index 4eaadf6..fd53263 100644
--- a/sys/vm/vm_swap.c
+++ b/sys/vm/vm_swap.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_swap.c	8.5 (Berkeley) 2/17/94
- * $Id: vm_swap.c,v 1.4 1994/08/06 09:15:41 davidg Exp $
+ * $Id: vm_swap.c,v 1.5 1994/09/11 03:55:39 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -385,10 +385,6 @@ swfree(p, index)
 		blk = niswap;
 		for (swp = &swdevt[niswdev]; swp != sp; swp++)
 			blk += swp->sw_nblks;
-#if 0
-		rmfree(swapmap, nblks, blk);
-		return (0);
-#endif
 		rlist_free(&swapmap, blk, blk + nblks - 1); 
 		vm_swap_size += nblks;
 		return (0);
@@ -406,25 +402,6 @@ swfree(p, index)
 #endif
 		if (blk > dmmax)
 			blk = dmmax;
-#if 0
-		if (vsbase == 0) {
-			/*
-			 * First of all chunks... initialize the swapmap.
-			 * Don't use the first cluster of the device
-			 * in case it starts with a label or boot block.
-			 */
-			rminit(swapmap, blk - ctod(CLSIZE),
-			    vsbase + ctod(CLSIZE), "swap", nswapmap);
-		} else if (dvbase == 0) {
-			/*
-			 * Don't use the first cluster of the device
-			 * in case it starts with a label or boot block.
-			 */
-			rmfree(swapmap, blk - ctod(CLSIZE),
-			    vsbase + ctod(CLSIZE));
-		} else
-			rmfree(swapmap, blk, vsbase);
-#endif
 		/* XXX -- we need to exclude the first cluster as above */
 		/* but for now, this will work fine... */
 		rlist_free(&swapmap, vsbase, vsbase + blk - 1);