* debian/changelog: Update.

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

svn path=/dists/trunk/linux/; revision=19535
This commit is contained in:
Bastian Blank 2012-11-25 14:09:06 +00:00
parent 99c6d67eb2
commit c36d637cca
3 changed files with 5 additions and 4 deletions

1
debian/changelog vendored
View File

@ -10,6 +10,7 @@ linux (3.6.7-1~experimental.1) UNRELEASED; urgency=low
* [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@debian.org> Wed, 21 Nov 2012 09:34:28 +0100

View File

@ -4035,6 +4035,10 @@ CONFIG_KSM=y
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

View File

@ -1606,10 +1606,6 @@ CONFIG_SPARSE_IRQ=y
## 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