[Glibc-bsd-commits] r3694 - in trunk/kfreebsd-9/debian: arch/amd64 patches

[Robert Millan]

Author: rmh
Date: 2011-09-02 18:26:28 +0000 (Fri, 02 Sep 2011)
New Revision: 3694

Modified:
   trunk/kfreebsd-9/debian/arch/amd64/amd64.config
   trunk/kfreebsd-9/debian/patches/916_NKPT_amd64.diff
Log:
Use NKPT config option

Modified: trunk/kfreebsd-9/debian/arch/amd64/amd64.config
===================================================================
--- trunk/kfreebsd-9/debian/arch/amd64/amd64.config	2011-08-31 20:28:15 UTC (rev 3693)
+++ trunk/kfreebsd-9/debian/arch/amd64/amd64.config	2011-09-02 18:26:28 UTC (rev 3694)
@@ -18,6 +18,9 @@
 options		SC_PIXEL_MODE	# add support for the raster text mode
 options		TEKEN_UTF8	# UTF-8 output handling
 
+# Needed for D-I, see #596577
+options		NKPT=240
+
 # Network options
 device		carp
 device		pf

Modified: trunk/kfreebsd-9/debian/patches/916_NKPT_amd64.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/916_NKPT_amd64.diff	2011-08-31 20:28:15 UTC (rev 3693)
+++ trunk/kfreebsd-9/debian/patches/916_NKPT_amd64.diff	2011-09-02 18:26:28 UTC (rev 3694)
@@ -1,6 +1,8 @@
 
-See #596577
+Just to make sure NKPT is defined in config and not here.
 
+Also see #596577.
+
 --- a/sys/amd64/include/pmap.h
 +++ b/sys/amd64/include/pmap.h
 @@ -115,7 +115,7 @@
@@ -8,7 +10,7 @@
  /* Initial number of kernel page tables. */
  #ifndef NKPT
 -#define	NKPT		32
-+#define	NKPT		240
++#define	NKPT		eat shit and die
  #endif
  
  #define NKPML4E		1		/* number of kernel PML4 slots */