diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index bb617abe193..1f816360876 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -115,7 +115,7 @@
 #endif	/* SMP */
 #define	PTDPTDI		(KPTDI-1)	/* ptd entry that points to ptd! */
 #define	UMAXPTDI	(PTDPTDI-1)	/* ptd entry for user space end */
-#define	UMAXPTEOFF	(NPTEPG-UPAGES_HOLE) /* pte entry for user space end */
+#define	UMAXPTEOFF	(NPTEPG)	/* pte entry for user space end */
 
 /*
  * XXX doesn't really belong here I guess...
diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h
index 3274938be55..312d944a3f1 100644
--- a/sys/i386/include/param.h
+++ b/sys/i386/include/param.h
@@ -99,8 +99,6 @@
 
 #define IOPAGES	2		/* pages of i/o permission bitmap */
 #define UPAGES	2		/* pages of u-area */
-#define UPAGES_HOLE	2	/* pages of "hole" at top of user space where */
-				/* the upages used to be. DO NOT CHANGE! */
 
 /*
  * Constants related to network buffer management.
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index bb617abe193..1f816360876 100644
--- a/sys/i386/include/pmap.h
+++ b/sys/i386/include/pmap.h
@@ -115,7 +115,7 @@
 #endif	/* SMP */
 #define	PTDPTDI		(KPTDI-1)	/* ptd entry that points to ptd! */
 #define	UMAXPTDI	(PTDPTDI-1)	/* ptd entry for user space end */
-#define	UMAXPTEOFF	(NPTEPG-UPAGES_HOLE) /* pte entry for user space end */
+#define	UMAXPTEOFF	(NPTEPG)	/* pte entry for user space end */
 
 /*
  * XXX doesn't really belong here I guess...