Index: lib/libkvm/kvm_getswapinfo.c
===================================================================
--- lib/libkvm/kvm_getswapinfo.c
+++ lib/libkvm/kvm_getswapinfo.c
@@ -55,21 +55,17 @@
 
 static struct nlist kvm_swap_nl[] = {
 	{ .n_name = "_swtailq" },	/* list of swap devices and sizes */
-	{ .n_name = "_dmmax" },		/* maximum size of a swap block */
 	{ .n_name = NULL }
 };
 
 #define NL_SWTAILQ	0
-#define NL_DMMAX	1
 
 static int kvm_swap_nl_cached = 0;
 static int unswdev;  /* number of found swap dev's */
-static int dmmax;
 
 static int  kvm_getswapinfo_kvm(kvm_t *, struct kvm_swap *, int, int);
 static int  kvm_getswapinfo_sysctl(kvm_t *, struct kvm_swap *, int, int);
 static int  nlist_init(kvm_t *);
-static int  getsysctl(kvm_t *, const char *, void *, size_t);
 
 #define KREAD(kd, addr, obj) \
 	(kvm_read(kd, addr, (char *)(obj), sizeof(*obj)) != sizeof(*obj))
@@ -135,7 +131,7 @@
 	sp = TAILQ_FIRST(&swtailq);
 	for (i = 0; sp != NULL; i++) {
 		KGET2(sp, &swinfo, "swinfo");
-		ttl = swinfo.sw_nblks - dmmax;
+		ttl = swinfo.sw_nblks;
 		if (i < swap_max - 1) {
 			bzero(&swap_ary[i], sizeof(swap_ary[i]));
 			swap_ary[i].ksw_total = ttl;
@@ -157,9 +153,6 @@
         return(i);
 }
 
-#define	GETSYSCTL(kd, name, var)					\
-	    getsysctl(kd, name, &(var), sizeof(var))
-
 /* The maximum MIB length for vm.swap_info and an additional device number */
 #define	SWI_MAXMIB	3
 
@@ -174,9 +167,6 @@
 	struct xswdev xsd;
 	struct kvm_swap tot;
 
-	if (!GETSYSCTL(kd, "vm.dmmax", dmmax))
-		return -1;
-
 	mibi = SWI_MAXMIB - 1;
 	if (sysctlnametomib("vm.swap_info", soid, &mibi) == -1) {
 		_kvm_err(kd, kd->program, "sysctlnametomib failed: %s",
@@ -205,7 +195,7 @@
 			return -1;
 		}
 
-		ttl = xsd.xsw_nblks - dmmax;
+		ttl = xsd.xsw_nblks;
 		if (unswdev < swap_max - 1) {
 			bzero(&swap_ary[unswdev], sizeof(swap_ary[unswdev]));
 			swap_ary[unswdev].ksw_total = ttl;
@@ -243,30 +233,6 @@
 		return (0);
 	}
 
-	if (kvm_swap_nl[NL_DMMAX].n_value == 0) {
-		_kvm_err(kd, kd->program, "unable to find dmmax");
-		return (0);
-	}
-
-	/* Get globals, type of swap */
-	KGET(NL_DMMAX, &dmmax);
-
 	kvm_swap_nl_cached = 1;
-	return (1);
-}
-
-static int
-getsysctl(kvm_t *kd, const char *name, void *ptr, size_t len)
-{
-	size_t nlen = len;
-	if (sysctlbyname(name, ptr, &nlen, NULL, 0) == -1) {
-		_kvm_err(kd, kd->program, "cannot read sysctl %s:%s", name,
-		    strerror(errno));
-		return (0);
-	}
-	if (nlen != len) {
-		_kvm_err(kd, kd->program, "sysctl %s has unexpected size", name);
-		return (0);
-	}
 	return (1);
 }