From 00e500a2e5fddd721d9785e9306d31461adc44bb Mon Sep 17 00:00:00 2001
From: Dmitrij Tejblum <dt@FreeBSD.org>
Date: Fri, 11 Sep 1998 14:38:12 +0000
Subject: [PATCH] Some fixes for swap space accounting.

Obtained from:  pstat.c
---
 usr.bin/top/machine.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c
index e5edd4080272..b0845e6b1a86 100644
--- a/usr.bin/top/machine.c
+++ b/usr.bin/top/machine.c
@@ -19,7 +19,7 @@
  *          Steven Wallace  <swallace@freebsd.org>
  *          Wolfram Schneider <wosch@FreeBSD.org>
  *
- * $Id: machine.c,v 1.13 1998/08/04 14:10:30 des Exp $
+ * $Id: machine.c,v 1.14 1998/08/12 09:58:15 wosch Exp $
  */
 
 
@@ -1084,8 +1084,13 @@ swapmode(retavail, retfree)
 		 * Don't report statistics for partitions which have not
 		 * yet been activated via swapon(8).
 		 */
+		if (!(sw[i].sw_flags & SW_FREED))
+			continue;
 
-		xsize = sw[i].sw_nblks;
+		/* The first dmmax is never allocated to avoid trashing of
+		 * disklabels
+		 */
+		xsize = sw[i].sw_nblks - dmmax;
 		xfree = perdev[i];
 		used = xsize - xfree;
 		npfree++;