From: Christoph Lameter <clameter@sgi.com>
Date: Sat, 25 Mar 2006 11:06:48 +0000 (-0800)
Subject: [PATCH] mm: make page migration dependent on swap and NUMA
X-Git-Tag: v2.6.17-rc1~849
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d784124cfe9377c1a24d8efba31401f81c7c11f9;p=linux-2.6-omap-h63xx.git

[PATCH] mm: make page migration dependent on swap and NUMA

The page migration code could function without NUMA but we currently have
no users for the non-NUMA case.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Cc: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/mm/Kconfig b/mm/Kconfig
index bd80460360d..332f5c29b53 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -138,8 +138,8 @@ config SPLIT_PTLOCK_CPUS
 #
 config MIGRATION
 	bool "Page migration"
-	def_bool y if NUMA || SPARSEMEM || DISCONTIGMEM
-	depends on SWAP
+	def_bool y if NUMA
+	depends on SWAP && NUMA
 	help
 	  Allows the migration of the physical location of pages of processes
 	  while the virtual addresses are not changed. This is useful for