diff --git a/sys/arch/atari/include/vmparam.h b/sys/arch/atari/include/vmparam.h
index 84ae6ea5fe65..325b879f036a 100644
--- a/sys/arch/atari/include/vmparam.h
+++ b/sys/arch/atari/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.29 2014/07/26 13:24:34 tsutsui Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.30 2017/02/02 21:50:22 rin Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -80,13 +80,6 @@
 #define	MAXSSIZ		(256*1024*1024)		/* max stack size */
 #endif
 
-/*
- * Sizes of the system and user portions of the system page table.
- */
-/* SYSPTSIZE IS SILLY; IT SHOULD BE COMPUTED AT BOOT TIME */
-#define	SYSPTSIZE	(2 * NPTEPG)	/* 16mb */
-#define	USRPTSIZE 	(1 * NPTEPG)	/* 16mb */
-
 /*
  * PTEs for mapping user space into the kernel for phyio operations.
  * One page is enough to handle 16Mb of simultaneous raw IO operations.
@@ -133,5 +126,5 @@ struct pmap_physseg {
 /*
  * number of kernel PT pages (initial only, can grow dynamically)
  */
-#define VM_KERNEL_PT_PAGES	((vsize_t)4)		/* XXX: SYSPTSIZE */
+#define VM_KERNEL_PT_PAGES	((vsize_t)4)
 #endif /* !_MACHINE_VMPARAM_H_ */
diff --git a/sys/arch/cesfic/include/vmparam.h b/sys/arch/cesfic/include/vmparam.h
index a6780207fc13..7b58c2dd09c4 100644
--- a/sys/arch/cesfic/include/vmparam.h
+++ b/sys/arch/cesfic/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.15 2011/02/08 20:20:11 rmind Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.16 2017/02/02 21:50:22 rin Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -95,13 +95,6 @@
 #define	DMMIN	32			/* smallest swap allocation */
 #define	DMMAX	4096			/* largest potential swap allocation */
 
-/*
- * Sizes of the system and user portions of the system page table.
- */
-/* SYSPTSIZE IS SILLY; IT SHOULD BE COMPUTED AT BOOT TIME */
-#define	SYSPTSIZE	(2 * NPTEPG)	/* 8mb */
-#define	USRPTSIZE 	(1 * NPTEPG)	/* 4mb */
-
 /*
  * PTEs for mapping user space into the kernel for phyio operations.
  * One page is enough to handle 4Mb of simultaneous raw IO operations.
@@ -125,7 +118,7 @@
 #define VM_PHYS_SIZE		(USRIOSIZE*PAGE_SIZE)
 
 /* # of kernel PT pages (initial only, can grow dynamically) */
-#define VM_KERNEL_PT_PAGES	((vsize_t)2)		/* XXX: SYSPTSIZE */
+#define VM_KERNEL_PT_PAGES	((vsize_t)2)
 
 /* Use new VM page bootstrap interface. */
 #define	MACHINE_NEW_NONCONTIG
diff --git a/sys/arch/hp300/include/vmparam.h b/sys/arch/hp300/include/vmparam.h
index ac97787b144a..219c02b4305a 100644
--- a/sys/arch/hp300/include/vmparam.h
+++ b/sys/arch/hp300/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.37 2011/02/08 20:20:14 rmind Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.38 2017/02/02 21:50:22 rin Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -85,13 +85,6 @@
 #define	MAXSSIZ		MAXDSIZ			/* max stack size */
 #endif
 
-/*
- * Sizes of the system and user portions of the system page table.
- */
-/* SYSPTSIZE IS SILLY; IT SHOULD BE COMPUTED AT BOOT TIME */
-#define	SYSPTSIZE	(2 * NPTEPG)	/* 8mb */
-#define	USRPTSIZE 	(1 * NPTEPG)	/* 4mb */
-
 /*
  * PTEs for mapping user space into the kernel for phyio operations.
  * One page is enough to handle 4Mb of simultaneous raw IO operations.
@@ -125,7 +118,7 @@
 #define VM_PHYS_SIZE		(USRIOSIZE*PAGE_SIZE)
 
 /* # of kernel PT pages (initial only, can grow dynamically) */
-#define VM_KERNEL_PT_PAGES	((vsize_t)2)		/* XXX: SYSPTSIZE */
+#define VM_KERNEL_PT_PAGES	((vsize_t)2)
 
 /*
  * Constants which control the way the VM system deals with memory segments.
diff --git a/sys/arch/luna68k/include/vmparam.h b/sys/arch/luna68k/include/vmparam.h
index 42c4f0791cd8..0ed9e5ed753c 100644
--- a/sys/arch/luna68k/include/vmparam.h
+++ b/sys/arch/luna68k/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.19 2014/07/26 12:48:07 tsutsui Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.20 2017/02/02 21:50:22 rin Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -73,13 +73,6 @@
 #define MAXSSIZ		MAXDSIZ			/* max stack size */
 #endif
 
-/*
- * Sizes of the system and user portions of the system page table.
- */
-/* SYSPTSIZE IS SILLY; IT SHOULD BE COMPUTED AT BOOT TIME */
-#define SYSPTSIZE	(2 * NPTEPG)	/* 8mb */
-#define USRPTSIZE 	(1 * NPTEPG)	/* 4mb */
-
 /*
  * PTEs for mapping user space into the kernel for phyio operations.
  * One page is enough to handle 4Mb of simultaneous raw IO operations.
@@ -103,7 +96,7 @@
 #define VM_PHYS_SIZE		(USRIOSIZE*PAGE_SIZE)
 
 /* # of kernel PT pages (initial only, can grow dynamically) */
-#define VM_KERNEL_PT_PAGES	((vsize_t)2)		/* XXX: SYSPTSIZE */
+#define VM_KERNEL_PT_PAGES	((vsize_t)2)
 
 /*
  * Constants which control the way the VM system deals with memory segments.
diff --git a/sys/arch/mac68k/include/vmparam.h b/sys/arch/mac68k/include/vmparam.h
index 338da0ca5991..509e20313f2b 100644
--- a/sys/arch/mac68k/include/vmparam.h
+++ b/sys/arch/mac68k/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.42 2011/02/08 20:20:18 rmind Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.43 2017/02/02 21:50:22 rin Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -118,13 +118,6 @@
 #define	MAXSSIZ		(32*1024*1024)		/* max stack size */
 #endif
 
-/*
- * Sizes of the system and user portions of the system page table.
- */
-/* SYSPTSIZE IS SILLY; IT SHOULD BE COMPUTED AT BOOT TIME */
-#define	SYSPTSIZE	(2 * NPTEPG)	/* 8mb */
-#define	USRPTSIZE 	(1 * NPTEPG)	/* 4mb */
-
 /*
  * PTEs for mapping user space into the kernel for phyio operations.
  * One page is enough to handle 4Mb of simultaneous raw IO operations.
@@ -148,7 +141,7 @@
 #define VM_PHYS_SIZE		(USRIOSIZE*PAGE_SIZE)
 
 /* # of kernel PT pages (initial only, can grow dynamically) */
-#define VM_KERNEL_PT_PAGES	((vsize_t)2)		/* XXX: SYSPTSIZE */
+#define VM_KERNEL_PT_PAGES	((vsize_t)2)
 
 /*
  * Constants which control the way the VM system deals with memory segments.
diff --git a/sys/arch/mac68k/mac68k/genassym.cf b/sys/arch/mac68k/mac68k/genassym.cf
index e4ef58e38972..ee2304d877a2 100644
--- a/sys/arch/mac68k/mac68k/genassym.cf
+++ b/sys/arch/mac68k/mac68k/genassym.cf
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.37 2013/07/16 07:31:40 jklos Exp $
+#	$NetBSD: genassym.cf,v 1.38 2017/02/02 21:50:23 rin Exp $
 
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -80,8 +80,6 @@ define	P1PAGES 		P1PAGES
 define	PAGE_SIZE		PAGE_SIZE
 define	NPTEPG			NPTEPG
 define	PGSHIFT 		PGSHIFT
-define	SYSPTSIZE		SYSPTSIZE
-define	USRPTSIZE		USRPTSIZE
 define	USRIOSIZE		USRIOSIZE
 define	USRSTACK		USRSTACK
 
diff --git a/sys/arch/mvme68k/include/vmparam.h b/sys/arch/mvme68k/include/vmparam.h
index 22e441692085..9441ba285267 100644
--- a/sys/arch/mvme68k/include/vmparam.h
+++ b/sys/arch/mvme68k/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.34 2011/02/08 20:20:20 rmind Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.35 2017/02/02 21:50:23 rin Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -85,13 +85,6 @@
 #define	MAXSSIZ		MAXDSIZ			/* max stack size */
 #endif
 
-/*
- * Sizes of the system and user portions of the system page table.
- */
-/* SYSPTSIZE IS SILLY; IT SHOULD BE COMPUTED AT BOOT TIME */
-#define	SYSPTSIZE	(2 * NPTEPG)	/* 8mb */
-#define	USRPTSIZE 	(1 * NPTEPG)	/* 4mb */
-
 /*
  * PTEs for mapping user space into the kernel for phyio operations.
  * One page is enough to handle 4Mb of simultaneous raw IO operations.
@@ -115,7 +108,7 @@
 #define VM_PHYS_SIZE		(USRIOSIZE*PAGE_SIZE)
 
 /* # of kernel PT pages (initial only, can grow dynamically) */
-#define VM_KERNEL_PT_PAGES	((vsize_t)2)		/* XXX: SYSPTSIZE */
+#define VM_KERNEL_PT_PAGES	((vsize_t)2)
 
 /*
  * Constants which control the way the VM system deals with memory segments.
diff --git a/sys/arch/news68k/include/vmparam.h b/sys/arch/news68k/include/vmparam.h
index 57e24900f270..284198a67378 100644
--- a/sys/arch/news68k/include/vmparam.h
+++ b/sys/arch/news68k/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.19 2011/11/20 15:38:00 tsutsui Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.20 2017/02/02 21:50:23 rin Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -85,13 +85,6 @@
 #define	MAXSSIZ		MAXDSIZ			/* max stack size */
 #endif
 
-/*
- * Sizes of the system and user portions of the system page table.
- */
-/* SYSPTSIZE IS SILLY; IT SHOULD BE COMPUTED AT BOOT TIME */
-#define	SYSPTSIZE	(2 * NPTEPG)	/* 8mb */
-#define	USRPTSIZE 	(1 * NPTEPG)	/* 4mb */
-
 /*
  * PTEs for mapping user space into the kernel for phyio operations.
  * One page is enough to handle 4Mb of simultaneous raw IO operations.
@@ -115,7 +108,7 @@
 #define VM_PHYS_SIZE		(USRIOSIZE*PAGE_SIZE)
 
 /* # of kernel PT pages (initial only, can grow dynamically) */
-#define VM_KERNEL_PT_PAGES	((vsize_t)2)		/* XXX: SYSPTSIZE */
+#define VM_KERNEL_PT_PAGES	((vsize_t)2)
 
 /*
  * Constants which control the way the VM system deals with memory segments.
diff --git a/sys/arch/next68k/include/vmparam.h b/sys/arch/next68k/include/vmparam.h
index 0f1487582082..40837caa3a8a 100644
--- a/sys/arch/next68k/include/vmparam.h
+++ b/sys/arch/next68k/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.23 2011/02/08 20:20:21 rmind Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.24 2017/02/02 21:50:23 rin Exp $	*/
 
 /*
  * This file was taken from from mvme68k/include/vmparam.h and
@@ -92,13 +92,6 @@
 #define	MAXSSIZ		MAXDSIZ			/* max stack size */
 #endif
 
-/*
- * Sizes of the system and user portions of the system page table.
- */
-/* SYSPTSIZE IS SILLY; IT SHOULD BE COMPUTED AT BOOT TIME */
-#define	SYSPTSIZE	(2 * NPTEPG)	/* 8mb */
-#define	USRPTSIZE 	(1 * NPTEPG)	/* 4mb */
-
 /*
  * PTEs for mapping user space into the kernel for phyio operations.
  * One page is enough to handle 4Mb of simultaneous raw IO operations.
@@ -122,7 +115,7 @@
 #define VM_PHYS_SIZE		(USRIOSIZE*PAGE_SIZE)
 
 /* # of kernel PT pages (initial only, can grow dynamically) */
-#define VM_KERNEL_PT_PAGES	((vsize_t)2)		/* XXX: SYSPTSIZE */
+#define VM_KERNEL_PT_PAGES	((vsize_t)2)
 
 /*
  * Constants which control the way the VM system deals with memory segments.
diff --git a/sys/arch/x68k/include/vmparam.h b/sys/arch/x68k/include/vmparam.h
index b317d2ee7e1a..9e6d84264682 100644
--- a/sys/arch/x68k/include/vmparam.h
+++ b/sys/arch/x68k/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.36 2014/01/25 00:07:48 tsutsui Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.37 2017/02/02 21:50:23 rin Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -77,13 +77,6 @@
 #define	MAXSSIZ		MAXDSIZ			/* max stack size */
 #endif
 
-/*
- * Sizes of the system and user portions of the system page table.
- */
-/* SYSPTSIZE IS SILLY; IT SHOULD BE COMPUTED AT BOOT TIME */
-#define	SYSPTSIZE	(2 * NPTEPG)	/* 8mb */
-#define	USRPTSIZE 	(1 * NPTEPG)	/* 4mb */
-
 /*
  * PTEs for mapping user space into the kernel for phyio operations.
  * One page is enough to handle 4Mb of simultaneous raw IO operations.
@@ -107,7 +100,7 @@
 #define VM_PHYS_SIZE		(USRIOSIZE*PAGE_SIZE)
 
 /* # of kernel PT pages (initial only, can grow dynamically) */
-#define VM_KERNEL_PT_PAGES	((vsize_t)4)		/* XXX: SYSPTSIZE */
+#define VM_KERNEL_PT_PAGES	((vsize_t)4)
 
 /*
  * Constants which control the way the VM system deals with memory segments.