netfilter: masquerade: attach nat extension if not present

[mirror_ubuntu-artful-kernel.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 86e3e0e74d20e78d173c1fa6dc4096f81695634e..9b8fccb969dc0fee5f5e0a623bc5b97a99bbc602 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -153,7 +153,7 @@ config MOVABLE_NODE
        bool "Enable to assign a node which has only movable memory"
        depends on HAVE_MEMBLOCK
        depends on NO_BOOTMEM
-       depends on X86_64
+       depends on X86_64 || OF_EARLY_FLATTREE || MEMORY_HOTPLUG
        depends on NUMA
        default n
        help
@@ -447,13 +447,9 @@ 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
+       depends on TRANSPARENT_HUGEPAGE
 
 #
 # UP and nommu archs use km based percpu allocator