From b97079513125b4c499a85519f675593aef9b1246 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Sat, 25 Mar 2006 03:06:48 -0800
Subject: [PATCH] --- yaml --- r: 23512 b: refs/heads/master c:
 d784124cfe9377c1a24d8efba31401f81c7c11f9 h: refs/heads/master v: v3

---
 [refs]           | 2 +-
 trunk/mm/Kconfig | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1911a2fff771..a569448330e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0718dc2a82c865ca75975acabaf984057f9fd488
+refs/heads/master: d784124cfe9377c1a24d8efba31401f81c7c11f9
diff --git a/trunk/mm/Kconfig b/trunk/mm/Kconfig
index bd80460360db..332f5c29b53a 100644
--- a/trunk/mm/Kconfig
+++ b/trunk/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