if no swap has been configured at boot time, swapon could not add

the first swap partition.  This was a problem with ccd- or vnd-only swap
setups

1 files changed, 7 insertions, 4 deletions

diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c
index 7dd10c6979f..47bd8ba7ac1 100644
--- a/sys/vm/vm_swap.c
+++ b/sys/vm/vm_swap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_swap.c,v 1.5 1997/05/22 07:26:53 deraadt Exp $	*/
+/*	$OpenBSD: vm_swap.c,v 1.6 1997/08/18 13:55:59 niklas Exp $	*/
 /*	$NetBSD: vm_swap.c,v 1.32 1996/02/05 01:54:09 christos Exp $	*/
 
 /*
@@ -399,9 +399,12 @@ swfree(p, index)
 			nswap += nblks;
 		}
 #else
-		perdev = nswap / nswdev;
-		if (nblks > perdev)
-			nblks = perdev;
+		if (nswap > 0) {
+			perdev = nswap / nswdev;
+			if (nblks > perdev)
+				nblks = perdev;
+		} else
+			nswap = nblks;
 #endif
 		sp->sw_nblks = nblks;
 	}