Merge branch 'drm-intel-fixes-2' of ssh://master.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 3982be2..3ad483b 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -303,9 +303,9 @@ config NOMMU_INITIAL_TRIM_EXCESS
          See Documentation/nommu-mmap.txt for more information.
 
 config TRANSPARENT_HUGEPAGE
          See Documentation/nommu-mmap.txt for more information.
 
 config TRANSPARENT_HUGEPAGE

-       bool "Transparent Hugepage Support" if EMBEDDED
-       depends on X86_64 && MMU
-       default y
+       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.
        help
          Transparent Hugepages allows the kernel to use huge pages and
          huge tlb transparently to the applications whenever possible.


@@ -316,6 +316,30 @@ config TRANSPARENT_HUGEPAGE
 
          If memory constrained on embedded, you may want to say N.
 
 
          If memory constrained on embedded, you may want to say N.
 

+choice
+       prompt "Transparent Hugepage Support sysfs defaults"
+       depends on TRANSPARENT_HUGEPAGE
+       default TRANSPARENT_HUGEPAGE_ALWAYS
+       help
+         Selects the sysfs defaults for Transparent Hugepage Support.
+
+       config TRANSPARENT_HUGEPAGE_ALWAYS
+               bool "always"
+       help
+         Enabling Transparent Hugepage always, can increase the
+         memory footprint of applications without a guaranteed
+         benefit but it will work automatically for all applications.
+
+       config TRANSPARENT_HUGEPAGE_MADVISE
+               bool "madvise"
+       help
+         Enabling Transparent Hugepage madvise, will only provide a
+         performance improvement benefit to the applications using
+         madvise(MADV_HUGEPAGE) but it won't risk to increase the
+         memory footprint of applications without a guaranteed
+         benefit.
+endchoice
+

 #
 # UP and nommu archs use km based percpu allocator
 #
 #
 # UP and nommu archs use km based percpu allocator
 #