transparent_hugepage = madvise

4 files changed, 32 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c0416940c95..03c3f83ba507 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Mon Jul  3 02:31:59 UTC 2017
+# Tue Jul 11 04:58:37 UTC 2017
 pkgbase = linux-linode
 	pkgdesc = Kernel for Linode servers
 	pkgver = 4.12.0
@@ -36,8 +36,8 @@ pkgbase = linux-linode
 	source = preset
 	md5sums = fc454157e2d024d401a60905d6481c6b
 	md5sums = SKIP
-	md5sums = 75e39f159dd7de1158a7eabe476f200a
-	md5sums = 5b770b3004ce73a93b05e2efc2fe678e
+	md5sums = 3d5e68d8b9cddaf49b9f3a52c4436759
+	md5sums = e9ff420b2a89c96dd84a8576fae43d95
 	md5sums = bc30565cf444b710c252675cf65fb46e
 	md5sums = c52c29a8502f6c75e309208f0afab11f
 	md5sums = 625481f015365febcd65aa136ee555f9
@@ -45,8 +45,8 @@ pkgbase = linux-linode
 	md5sums = e1b5255cfbf5f8ca79b4b4568feec801
 	sha256sums = a45c3becd4d08ce411c14628a949d08e2433d8cdeca92036c7013980e93858ab
 	sha256sums = SKIP
-	sha256sums = cb30c96761f304109561166354f8dafa367c0d1293d92cd531e841020b51e1cd
-	sha256sums = f526a8f2ea389bda76dcd16956797abc607e65535a0e59870894dc7582550d6c
+	sha256sums = afb54c05456066a21403b509c833ca5a53a32504e3b093d3797ea549ddf18f0d
+	sha256sums = e7a146facce7105b5d74bea7ffb26ad8f35621be1da14136670fe8ed105f7edc
 	sha256sums = 7d56a81083d1468d90ebec97a44ec44f80f8cb87bd506ed1918d6664d6309ad5
 	sha256sums = 3efa91fcb4698bde0598678bbf9a4a747c011823af82704eed2c146ed7cd9734
 	sha256sums = 368fb58e7aa465f597e9a72da4b6eea4183c1a85242173412d54ad18d10d8fb3
@@ -54,8 +54,8 @@ pkgbase = linux-linode
 	sha256sums = 29fa2c1ea75f55a61276496507b788b1a8bde1d7c16bee4f525651db34076e46
 	sha512sums = 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728
 	sha512sums = SKIP
-	sha512sums = b1234680cd12015d73e253cbac00aa1d66ef988f1cbdeb68540b0a4014b4d45d3bee5b4aef5b063a02d5662c15d8e26c85644938e3f15ca23bc1747ea35a3736
-	sha512sums = 81e3eebbedd860544e90ec04424588dfb0c1632e52a038dd21e92763f4f1535253c33c7663e6424be8c14900f15233acef0d6940e9a43bcddc2daf13ae19601e
+	sha512sums = 57cad4a666f93eb982efd645b89f6f17b9e7266d4ac538d986e734434dade03b85a2c943d2934a7a073cf87aa9ca4d9d7db26b7e3ae4436a5e39afb5ce6f466f
+	sha512sums = 5d86b27aff9bdd7c005fb7ae776e74e2cf95ae031921ff1df10cfa2b1996fd87f60ed81ef7655209225e24035f5f86ac6642523ec9b01e10efb798f139646aca
 	sha512sums = 7a80f858c32a9dd62f43aba0b7119a1196869216117164bcde24ab46022e8a1bbe27821faa26ca690a1633a5a9fe324e98e5cdf14f37591d569cbc71f542482d
 	sha512sums = c57a6c8d9978cb6a1034bed33ba5e06bef9b134f22113761798d4fa46e8091e7b0bd26f3a14d79122ba780b2f7a93ca26850f4da6a654f81b34cc79c242f683f
 	sha512sums = db9080b2548e4dcd61eaaf20cd7d37cbbc8c204ce85a2e3408d0671f6b26010f77a61affd2c77e809768714eca29d3afb64765a3f2099317a2c928eff3feb4cf
diff --git a/PKGBUILD b/PKGBUILD
index e75b39b43123..5a42181f5701 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,24 +22,24 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar."{xz,sign}
         'menu.lst'
         'preset')
 sha512sums=('8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728' 'SKIP'
-            'b1234680cd12015d73e253cbac00aa1d66ef988f1cbdeb68540b0a4014b4d45d3bee5b4aef5b063a02d5662c15d8e26c85644938e3f15ca23bc1747ea35a3736'
-            '81e3eebbedd860544e90ec04424588dfb0c1632e52a038dd21e92763f4f1535253c33c7663e6424be8c14900f15233acef0d6940e9a43bcddc2daf13ae19601e'
+            '57cad4a666f93eb982efd645b89f6f17b9e7266d4ac538d986e734434dade03b85a2c943d2934a7a073cf87aa9ca4d9d7db26b7e3ae4436a5e39afb5ce6f466f'
+            '5d86b27aff9bdd7c005fb7ae776e74e2cf95ae031921ff1df10cfa2b1996fd87f60ed81ef7655209225e24035f5f86ac6642523ec9b01e10efb798f139646aca'
             '7a80f858c32a9dd62f43aba0b7119a1196869216117164bcde24ab46022e8a1bbe27821faa26ca690a1633a5a9fe324e98e5cdf14f37591d569cbc71f542482d'
             'c57a6c8d9978cb6a1034bed33ba5e06bef9b134f22113761798d4fa46e8091e7b0bd26f3a14d79122ba780b2f7a93ca26850f4da6a654f81b34cc79c242f683f'
             'db9080b2548e4dcd61eaaf20cd7d37cbbc8c204ce85a2e3408d0671f6b26010f77a61affd2c77e809768714eca29d3afb64765a3f2099317a2c928eff3feb4cf'
             '73cb4c064d8942fddaac48158b7e77d19afc1cb61f83936f21832ba7d7266ccfd3021114252edd5cec5542096204f48cf30544fd6bffff79bc94d96fabe74f52'
             '62870a08f000abfe8eb1f50271afdf04686af108554f7629dc5e1d7610ad14bdc9cd14d2609270b83f9edb745a520b81fa7bfb92ebcc28a146df040c895b549b')
 sha256sums=('a45c3becd4d08ce411c14628a949d08e2433d8cdeca92036c7013980e93858ab' 'SKIP'
-            'cb30c96761f304109561166354f8dafa367c0d1293d92cd531e841020b51e1cd'
-            'f526a8f2ea389bda76dcd16956797abc607e65535a0e59870894dc7582550d6c'
+            'afb54c05456066a21403b509c833ca5a53a32504e3b093d3797ea549ddf18f0d'
+            'e7a146facce7105b5d74bea7ffb26ad8f35621be1da14136670fe8ed105f7edc'
             '7d56a81083d1468d90ebec97a44ec44f80f8cb87bd506ed1918d6664d6309ad5'
             '3efa91fcb4698bde0598678bbf9a4a747c011823af82704eed2c146ed7cd9734'
             '368fb58e7aa465f597e9a72da4b6eea4183c1a85242173412d54ad18d10d8fb3'
             'a055b6005a324240b35c416d9d08fba21c5f614eefb46f244035d04bf085224f'
             '29fa2c1ea75f55a61276496507b788b1a8bde1d7c16bee4f525651db34076e46')
 md5sums=('fc454157e2d024d401a60905d6481c6b' 'SKIP'
-         '75e39f159dd7de1158a7eabe476f200a'
-         '5b770b3004ce73a93b05e2efc2fe678e'
+         '3d5e68d8b9cddaf49b9f3a52c4436759'
+         'e9ff420b2a89c96dd84a8576fae43d95'
          'bc30565cf444b710c252675cf65fb46e'
          'c52c29a8502f6c75e309208f0afab11f'
          '625481f015365febcd65aa136ee555f9'
diff --git a/config b/config
index 13fae85eabb3..bc9203cf0fa9 100644
--- a/config
+++ b/config
@@ -502,13 +502,18 @@ CONFIG_ARCH_DISCARD_MEMBLOCK=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_MEMORY_BALLOON=y
-# CONFIG_COMPACTION is not set
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_TRANSPARENT_HUGEPAGE=y
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
 # CONFIG_CMA is not set
@@ -2434,6 +2439,7 @@ CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_ANDROID is not set
 # CONFIG_LIBNVDIMM is not set
 CONFIG_DAX=y
+# CONFIG_DEV_DAX is not set
 # CONFIG_NVMEM is not set
 # CONFIG_STM is not set
 # CONFIG_INTEL_TH is not set
@@ -3087,6 +3093,7 @@ CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=y
 CONFIG_TEXTSEARCH_BM=y
 CONFIG_TEXTSEARCH_FSM=y
+CONFIG_RADIX_TREE_MULTIORDER=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
diff --git a/config.x86_64 b/config.x86_64
index dd20a8573b80..f2f52965d073 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -506,14 +506,20 @@ CONFIG_ARCH_DISCARD_MEMBLOCK=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_MEMORY_BALLOON=y
-# CONFIG_COMPACTION is not set
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_TRANSPARENT_HUGEPAGE=y
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
 # CONFIG_CMA is not set
@@ -2449,6 +2455,7 @@ CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_ANDROID is not set
 # CONFIG_LIBNVDIMM is not set
 CONFIG_DAX=y
+# CONFIG_DEV_DAX is not set
 # CONFIG_NVMEM is not set
 # CONFIG_STM is not set
 # CONFIG_INTEL_TH is not set
@@ -3140,6 +3147,7 @@ CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=y
 CONFIG_TEXTSEARCH_BM=y
 CONFIG_TEXTSEARCH_FSM=y
+CONFIG_RADIX_TREE_MULTIORDER=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y