[kernel] r19535 - in dists/trunk/linux/debian: . config config/kernelarch-x86

[Bastian Blank]

Author: waldi
Date: Sun Nov 25 14:09:06 2012
New Revision: 19535

Log:
* debian/changelog: Update.
* debian/config/config:
  Move TRANSPARENT_HUGEPAGE from debian/config/kernelarch-x86/config.

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/config
   dists/trunk/linux/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sun Nov 25 13:58:27 2012	(r19534)
+++ dists/trunk/linux/debian/changelog	Sun Nov 25 14:09:06 2012	(r19535)
@@ -10,6 +10,7 @@
   * [x86] Enable more platform drivers.
   * [s390/s390x-tape, s390x/s390x-tape] Remove not longer supported image
     variant.
+  * [s390, s390x] Enable support for transparent hugepages.
 
  -- Bastian Blank <waldi at debian.org>  Wed, 21 Nov 2012 09:34:28 +0100
 

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Sun Nov 25 13:58:27 2012	(r19534)
+++ dists/trunk/linux/debian/config/config	Sun Nov 25 14:09:06 2012	(r19535)
@@ -4035,6 +4035,10 @@
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_MEMORY_FAILURE=y
 CONFIG_HWPOISON_INJECT=m
+CONFIG_TRANSPARENT_HUGEPAGE=y
+## choice: Transparent Hugepage Support sysfs defaults
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+## end choice
 
 ##
 ## file: net/Kconfig

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config	Sun Nov 25 13:58:27 2012	(r19534)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config	Sun Nov 25 14:09:06 2012	(r19535)
@@ -1606,10 +1606,6 @@
 ## file: mm/Kconfig
 ##
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-CONFIG_TRANSPARENT_HUGEPAGE=y
-## choice: Transparent Hugepage Support sysfs defaults
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
-## end choice
 
 ##
 ## file: mm/Kconfig.debug