Merge tag 'linux-can-next-for-3.19-20141207' of git://gitorious.org/linux-can/linux...

[cascardo/linux.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 886db21..1d1ae6b 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -137,6 +137,9 @@ config HAVE_MEMBLOCK_NODE_MAP
 config HAVE_MEMBLOCK_PHYS_MAP
        boolean
 
+config HAVE_GENERIC_RCU_GUP
+       boolean
+
 config ARCH_DISCARD_MEMBLOCK
        boolean
 
@@ -227,12 +230,17 @@ config SPLIT_PTLOCK_CPUS
 config ARCH_ENABLE_SPLIT_PMD_PTLOCK
        boolean
 
+#
+# support for memory balloon
+config MEMORY_BALLOON
+       boolean
+
 #
 # support for memory balloon compaction
 config BALLOON_COMPACTION
        bool "Allow for balloon memory compaction/migration"
        def_bool y
-       depends on COMPACTION && VIRTIO_BALLOON
+       depends on COMPACTION && MEMORY_BALLOON
        help
          Memory fragmentation introduced by ballooning might reduce
          significantly the number of 2MB contiguous memory blocks that can be