2 files changed, 15 insertions, 17 deletions

diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 011833c6468a..d5718b3acca0 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -140,6 +140,20 @@ __FBSDID("$FreeBSD$");
 
 typedef	int32_t	swblk_t;	/* swap offset */
 
+/*
+ * Swap device table
+ */
+struct swdevt {
+	udev_t	sw_dev;			/* For quasibogus swapdev reporting */
+	int	sw_flags;
+	int	sw_nblks;
+	int     sw_used;
+	struct	vnode *sw_vp;
+	dev_t	sw_device;
+};
+
+#define	SW_CLOSING	0x04
+
 struct swblock {
 	struct swblock	*swb_hnext;
 	vm_object_t	swb_object;
@@ -2535,7 +2549,7 @@ swaponvp(td, vp, dev, nblks)
 	sp->sw_vp = vp;
 	sp->sw_dev = dev2udev(dev);
 	sp->sw_device = dev;
-	sp->sw_flags = SW_FREED;
+	sp->sw_flags = 0;
 	sp->sw_nblks = nblks;
 	sp->sw_used = 0;
 
diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h
index c0aa1b16dae4..d2d63aee1f13 100644
--- a/sys/vm/swap_pager.h
+++ b/sys/vm/swap_pager.h
@@ -47,22 +47,6 @@
 #ifndef	_VM_SWAP_PAGER_H_
 #define	_VM_SWAP_PAGER_H_ 1
 
-/*
- * Swap device table
- */
-struct swdevt {
-	udev_t	sw_dev;			/* For quasibogus swapdev reporting */
-	int	sw_flags;
-	int	sw_nblks;
-	int     sw_used;
-	struct	vnode *sw_vp;
-	dev_t	sw_device;
-};
-#define	SW_FREED	0x01
-#define	SW_SEQUENTIAL	0x02
-#define	SW_CLOSING	0x04
-#define	sw_freed	sw_flags	/* XXX compat */
-
 #ifdef _KERNEL
 
 extern int swap_pager_full;