Merge tag 'nfsd-4.8' of git://linux-nfs.org/~bfields/linux

[linux-2.6-block.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 3e2daef3c946a117bbfa4e63fa6a4fb7bd31a5ad..c0837845c17c408a123d5864c1bec354ee074723 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -439,6 +439,14 @@ choice
          benefit.
 endchoice
 
+#
+# We don't deposit page tables on file THP mapping,
+# but Power makes use of them to address MMU quirk.
+#
+config TRANSPARENT_HUGE_PAGECACHE
+       def_bool y
+       depends on TRANSPARENT_HUGEPAGE && !PPC
+
 #
 # UP and nommu archs use km based percpu allocator
 #
@@ -673,7 +681,7 @@ config IDLE_PAGE_TRACKING
          See Documentation/vm/idle_page_tracking.txt for more details.
 
 config ZONE_DEVICE
-       bool "Device memory (pmem, etc...) hotplug support" if EXPERT
+       bool "Device memory (pmem, etc...) hotplug support"
        depends on MEMORY_HOTPLUG
        depends on MEMORY_HOTREMOVE
        depends on SPARSEMEM_VMEMMAP