Index: util-linux-2.12r/disk-utils/mkswap.c
===================================================================
--- util-linux-2.12r.orig/disk-utils/mkswap.c	2004-12-21 09:21:24.000000000 -0800
+++ util-linux-2.12r/disk-utils/mkswap.c	2006-10-23 17:51:24.636063632 -0700
@@ -602,9 +602,7 @@
 			version = 1;
 		else
 		/* use version 1 as default, if possible */
-		if (PAGES <= V0_MAX_PAGES && PAGES > V1_MAX_PAGES)
-			version = 0;
-		else if (linux_version_code() < MAKE_VERSION(2,1,117))
+		if (linux_version_code() < MAKE_VERSION(2,1,117))
 			version = 0;
 		else if (pagesize < 2048)
 			version = 0;