1) Merged swpager structure into vm_object.

2) Changed swap_pager internal interfaces to cope w/#1.
3) Eliminated object->copy as we no longer have copy objects.
4) Minor stylistic changes.

1 files changed, 1 insertions, 13 deletions

diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h
index a2beaa6..7bdc56d 100644
--- a/sys/vm/swap_pager.h
+++ b/sys/vm/swap_pager.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)swap_pager.h	7.1 (Berkeley) 12/5/90
- *	$Id: swap_pager.h,v 1.6 1995/05/10 18:56:04 davidg Exp $
+ *	$Id: swap_pager.h,v 1.7 1995/07/13 08:48:17 davidg Exp $
  */
 
 /*
@@ -63,18 +63,6 @@ struct swblock {
 };
 typedef struct swblock *sw_blk_t;
 
-/*
- * Swap pager private data.
- */
-struct swpager {
-	int sw_nblocks;		/* number of blocks in list (sw_blk_t units) */
-	int sw_allocsize;	/* amount of space actually allocated */
-	sw_blk_t sw_blocks;	/* pointer to list of swap blocks */
-	short sw_poip;		/* pageouts in progress */
-	short sw_piip;		/* pageins in progress */
-};
-typedef struct swpager *sw_pager_t;
-
 #ifdef KERNEL
 void swap_pager_init __P((void));
 vm_object_t swap_pager_alloc __P((void *, vm_size_t, vm_prot_t, vm_offset_t));