Index: linux-2.6.17-rc1/mm/Kconfig
===================================================================
--- linux-2.6.17-rc1.orig/mm/Kconfig	2006-04-02 20:22:10.000000000 -0700
+++ linux-2.6.17-rc1/mm/Kconfig	2006-04-06 10:44:05.000000000 -0700
@@ -139,7 +139,7 @@ config SPLIT_PTLOCK_CPUS
 config MIGRATION
 	bool "Page migration"
 	def_bool y if NUMA
-	depends on SWAP && NUMA
+	depends on NUMA && HAVE_PTE_DISABLE
 	help
 	  Allows the migration of the physical location of pages of processes
 	  while the virtual addresses are not changed. This is useful for
Index: linux-2.6.17-rc1/include/linux/migrate.h
===================================================================
--- linux-2.6.17-rc1.orig/include/linux/migrate.h	2006-04-02 20:22:10.000000000 -0700
+++ linux-2.6.17-rc1/include/linux/migrate.h	2006-04-06 10:44:34.000000000 -0700
@@ -4,6 +4,12 @@
 #include <linux/config.h>
 #include <linux/mm.h>
 
+#ifndef CONFIG_HAVE_PTE_DISABLE
+#define pte_disabled(pte)	0
+#define pte_disable(ptep)	do { } while (0)
+#define pte_enable(ptep)	do { } while (0)
+#endif
+
 #ifdef CONFIG_MIGRATION
 extern int isolate_lru_page(struct page *p, struct list_head *pagelist);
 extern int putback_lru_pages(struct list_head *l);