From: Andrea Arcangeli <aarcange@redhat.com>
Date: Thu, 9 Sep 2010 23:37:53 +0000 (-0700)
Subject: mm: avoid warning when COMPACTION is selected
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=152e0659fc001029c70fa4373af1792b1ae0d01c;hp=4969c1192d15afa3389e7ae3302096ff684ba655;p=mv-sheeva.git

mm: avoid warning when COMPACTION is selected

COMPACTION enables MIGRATION, but MIGRATION spawns a warning if numa or
memhotplug aren't selected.  However MIGRATION doesn't depend on them.  I
guess it's just trying to be strict doing a double check on who's enabling
it, but it doesn't know that compaction also enables MIGRATION.

Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Acked-by: Mel Gorman <mel@csn.ul.ie>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/mm/Kconfig b/mm/Kconfig
index f4e516e9c37..f0fb9124e41 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -189,7 +189,7 @@ config COMPACTION
 config MIGRATION
 	bool "Page migration"
 	def_bool y
-	depends on NUMA || ARCH_ENABLE_MEMORY_HOTREMOVE
+	depends on NUMA || ARCH_ENABLE_MEMORY_HOTREMOVE || COMPACTION
 	help
 	  Allows the migration of the physical location of pages of processes
 	  while the virtual addresses are not changed. This is useful in