do not use TRANSPARENT_HUGEPAGE by default

diff --git a/Makefile b/Makefile
index 9cdfac9c706873e29f76317b4fc746e2ce70c8c3..655acaf5f150a1a628f0fd5302d2db0eac690c48 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=4.0
 
 KERNEL_VER=4.2.0
-PKGREL=10
+PKGREL=11
 # also i7clude firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=1
@@ -164,6 +164,9 @@ data: .compile_mark ${SPL_MODULES} ${ZFS_MODULES} ${DRBD_MODULES}
        mv tmp data
 
 PVE_CONFIG_OPTS= \
+-d CONFIG_TRANSPARENT_HUGEPAGE_MADVISE \
+-d CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS \
+-e CONFIG_TRANSPARENT_HUGEPAGE_NEVER \
 -m CONFIG_CEPH_FS \
 -m CONFIG_BLK_DEV_NBD \
 -m CONFIG_BLK_DEV_RBD \
@@ -200,6 +203,7 @@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR}
        rm -rf ${KERNEL_SRC}
        tar xf ${KERNELSRCTAR}
        cat ${KERNEL_SRC}/debian.master/config/config.common.ubuntu ${KERNEL_SRC}/debian.master/config/amd64/config.common.amd64 ${KERNEL_SRC}/debian.master/config/amd64/config.flavour.generic > ${KERNEL_CFG_ORG}
+       cd ${KERNEL_SRC}; patch -p1 <../add-thp-never-option.patch
        # see https://github.com/zfsonlinux/zfs/issues/3511
        # should be fixed with zfs 0.6.5
        cd ${KERNEL_SRC}; patch -p1 <../0001-Revert-block-loop-switch-to-VFS-ITER_BVEC.patch

diff --git a/add-thp-never-option.patch b/add-thp-never-option.patch
new file mode 100644 (file)
index 0000000..7589db5
--- /dev/null
+++ b/add-thp-never-option.patch
@@ -0,0 +1,15 @@
+--- ubuntu-wily/mm/Kconfig.org 2015-09-15 09:46:53.770389180 +0200
++++ ubuntu-wily/mm/Kconfig     2015-09-15 09:48:05.813854679 +0200
+@@ -444,6 +444,12 @@
+         madvise(MADV_HUGEPAGE) but it won't risk to increase the
+         memory footprint of applications without a guaranteed
+         benefit.
++
++      config TRANSPARENT_HUGEPAGE_NEVER
++              bool "never"
++      help
++        Disable Transparent Hugepage
++
+ endchoice
+ 
+ #

diff --git a/changelog.Debian b/changelog.Debian
index ef452f0d43eb98d5fc1d41e2f295bf91e9bdf266..3c4610be897f676679c40feffc2da3f8fc04c723 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+pve-kernel-4.1.3 (4.2.0-11) unstable; urgency=medium
+
+  * do not use TRANSPARENT_HUGEPAGE by default
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 15 Sep 2015 09:53:08 +0200
+
 pve-kernel-4.1.3 (4.2.0-10) unstable; urgency=medium
 
   * update drbd9 driver