[kernel] r17108 - in dists/sid/linux-2.6/debian: . config/i386/none config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Thu Mar 24 05:29:31 2011
New Revision: 17108

Log:
[x86/!486] Enable TRANSPARENT_HUGEPAGE, TRANSPARENT_HUGEPAGE_MADVISE (Closes: #618924)

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/i386/none/config.486
   dists/sid/linux-2.6/debian/config/kernelarch-x86/config

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Thu Mar 24 05:23:39 2011	(r17107)
+++ dists/sid/linux-2.6/debian/changelog	Thu Mar 24 05:29:31 2011	(r17108)
@@ -8,6 +8,8 @@
   * Add configuration for Debian architecture ppc64, matching the
     powerpc/powerpc64 flavour (Closes: #618976)
   * Enable BOOT_PRINTK_DELAY (support for the boot_delay kernel parameter)
+  * [x86/!486] Enable TRANSPARENT_HUGEPAGE, TRANSPARENT_HUGEPAGE_MADVISE
+    (Closes: #618924)
 
   [ Jurij Smakov ]
   * Bump CONFIG_NR_CPUS on sparc to 256 to accomodate T2+ machines

Modified: dists/sid/linux-2.6/debian/config/i386/none/config.486
==============================================================================
--- dists/sid/linux-2.6/debian/config/i386/none/config.486	Thu Mar 24 05:23:39 2011	(r17107)
+++ dists/sid/linux-2.6/debian/config/i386/none/config.486	Thu Mar 24 05:29:31 2011	(r17108)
@@ -111,3 +111,7 @@
 ##
 CONFIG_FB_GEODE_LX=y
 
+##
+## file: mm/Kconfig
+##
+CONFIG_TRANSPARENT_HUGEPAGE=n

Modified: dists/sid/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/kernelarch-x86/config	Thu Mar 24 05:23:39 2011	(r17107)
+++ dists/sid/linux-2.6/debian/config/kernelarch-x86/config	Thu Mar 24 05:29:31 2011	(r17108)
@@ -1372,6 +1372,8 @@
 ## file: mm/Kconfig
 ##
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 
 ##
 ## file: mm/Kconfig.debug