Index: conf/options.i386
===================================================================
RCS file: /home/ncvs/src/sys/conf/options.i386,v
retrieving revision 1.156
diff -u -r1.156 options.i386
--- conf/options.i386	2001/09/12 08:36:59	1.156
+++ conf/options.i386	2001/09/21 05:42:09
@@ -35,6 +35,9 @@
 # i386 SMP options
 APIC_IO			opt_global.h
 
+# Change KVM size.  Changes things all over the kernel.
+KVA_PAGES		opt_global.h
+
 CLK_CALIBRATION_LOOP		opt_clock.h
 CLK_USE_I8254_CALIBRATION	opt_clock.h
 CLK_USE_TSC_CALIBRATION		opt_clock.h
Index: conf/options.pc98
===================================================================
RCS file: /home/ncvs/src/sys/conf/options.pc98,v
retrieving revision 1.129
diff -u -r1.129 options.pc98
--- conf/options.pc98	2001/09/16 05:24:05	1.129
+++ conf/options.pc98	2001/09/21 05:42:09
@@ -35,6 +35,9 @@
 # i386 SMP options
 APIC_IO			opt_global.h
 
+# Change KVM size.  Changes things all over the kernel.
+KVA_PAGES		opt_global.h
+
 CLK_CALIBRATION_LOOP		opt_clock.h
 CLK_USE_I8254_CALIBRATION	opt_clock.h
 CLK_USE_TSC_CALIBRATION		opt_clock.h
Index: i386/include/pmap.h
===================================================================
RCS file: /home/ncvs/src/sys/i386/include/pmap.h,v
retrieving revision 1.70
diff -u -r1.70 pmap.h
--- i386/include/pmap.h	2000/11/30 01:53:02	1.70
+++ i386/include/pmap.h	2001/09/21 05:42:09
@@ -83,19 +83,27 @@
 #define PGEX_U		0x04	/* access from User mode (UPL) */
 
 /*
+ * Size of Kernel address space.  This is the number of page table pages
+ * (4MB each) to use for the kernel.  256 pages == 1 Gigabyte.
+ */
+#ifndef KVA_PAGES
+#define KVA_PAGES	256
+#endif
+
+/*
  * Pte related macros
  */
 #define VADDR(pdi, pti) ((vm_offset_t)(((pdi)<<PDRSHIFT)|((pti)<<PAGE_SHIFT)))
 
 #ifndef NKPT
-#define	NKPT			30	/* actual number of kernel page tables */
+#define	NKPT		30	/* actual number of kernel page tables */
 #endif
 #ifndef NKPDE
 #ifdef SMP
-#define NKPDE			254	/* addressable number of page tables/pde's */
+#define NKPDE	(KVA_PAGES - 2)	/* addressable number of page tables/pde's */
 #else
-#define NKPDE			255	/* addressable number of page tables/pde's */
-#endif	/* SMP */
+#define NKPDE	(KVA_PAGES - 1)	/* addressable number of page tables/pde's */
+#endif
 #endif
 
 /*