Signed-off-by: Dave Hansen --- memhotplug-dave/mm/Kconfig | 11 +++++++++++ memhotplug-dave/mm/mmigrate.c | 3 ++- 2 files changed, 13 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-28 16:38:12.000000000 -0800 @@ -0,0 +1,11 @@ +config MEMORY_MIGRATE + select SWAP + bool "Memory migration" + default y if MEMORY_HOTPLUG + +config MEMORY_REMOVE + bool "Allow for memory hot-remove" + depends on MEMORY_HOTPLUG && MEMORY_MIGRATE && (X86 && !X86_64) + help + Enabling this option allows you to hot-remove highmem zones + on i386 systems. The i386 depenence is a hack for now. 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-28 16:38:12.000000000 -0800 +++ memhotplug-dave/mm/mmigrate.c 2005-03-28 16:38:12.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); } _