Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
---

 memhotplug-dave/mm/Kconfig    |    3 +++
 memhotplug-dave/mm/mmigrate.c |    3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff -puN /dev/null mm/Kconfig
--- /dev/null	2004-11-08 15:18:04.000000000 -0800
+++ memhotplug-dave/mm/Kconfig	2005-03-11 10:51:41.000000000 -0800
@@ -0,0 +1,3 @@
+config MEMORY_MIGRATE
+	select SWAP
+	bool "Memory migration"
diff -puN mm/mmigrate.c~AA-PM-07.1-memory_migration-merge mm/mmigrate.c
--- memhotplug/mm/mmigrate.c~AA-PM-07.1-memory_migration-merge	2005-03-11 10:51:41.000000000 -0800
+++ memhotplug-dave/mm/mmigrate.c	2005-03-11 10:51:41.000000000 -0800
@@ -310,7 +310,8 @@ migrate_onepage(struct page *page)
 	 * Allocate a new page with the same gfp_mask
 	 * as the target page has.
 	 */
-	if ((newpage = page_cache_alloc(mapping)) == NULL) {
+	newpage = page_cache_alloc(mapping);
+	if (newpage == NULL) {
 		unlock_page(page);
 		return ERR_PTR(-ENOMEM);
 	}
_