diff --git a/[refs] b/[refs] index e5768123828a..75ef033eab0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13ece886d99cd668483113f7238e419d5331af26 +refs/heads/master: 5d6892407cab23d4bf2f6de065ca351a53849323 diff --git a/trunk/mm/Kconfig b/trunk/mm/Kconfig index 3e81687263b5..3ad483bdf505 100644 --- a/trunk/mm/Kconfig +++ b/trunk/mm/Kconfig @@ -305,6 +305,7 @@ config NOMMU_INITIAL_TRIM_EXCESS config TRANSPARENT_HUGEPAGE bool "Transparent Hugepage Support" depends on X86 && MMU + select COMPACTION help Transparent Hugepages allows the kernel to use huge pages and huge tlb transparently to the applications whenever possible.