From fb5bfd10336ac1ba8cde348e23bc2e23661bec41 Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki Date: Wed, 14 Nov 2007 16:59:12 -0800 Subject: [PATCH] --- yaml --- r: 73683 b: refs/heads/master c: dbc0e4cefd003834440fe7ac5464616c5235cb94 h: refs/heads/master i: 73681: cb72629ef5765f76f783ab1678ba6bdf663fd03b 73679: b7277d649d1134f81d986263758ed491f941f09f v: v3 --- [refs] | 2 +- trunk/mm/memory_hotplug.c | 4 ++-- trunk/mm/page_isolation.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 1ac3dad4eb33..d9476da38ad7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ad33b2436b545cbe8b28e53f3710432cad457ab +refs/heads/master: dbc0e4cefd003834440fe7ac5464616c5235cb94 diff --git a/trunk/mm/memory_hotplug.c b/trunk/mm/memory_hotplug.c index 3a47871a29d9..987abe6375ed 100644 --- a/trunk/mm/memory_hotplug.c +++ b/trunk/mm/memory_hotplug.c @@ -574,8 +574,8 @@ int offline_pages(unsigned long start_pfn, /* Ok, all of our target is islaoted. We cannot do rollback at this point. */ offline_isolated_pages(start_pfn, end_pfn); - /* reset pagetype flags */ - start_isolate_page_range(start_pfn, end_pfn); + /* reset pagetype flags and makes migrate type to be MOVABLE */ + undo_isolate_page_range(start_pfn, end_pfn); /* removal success */ zone->present_pages -= offlined_pages; zone->zone_pgdat->node_present_pages -= offlined_pages; diff --git a/trunk/mm/page_isolation.c b/trunk/mm/page_isolation.c index 8f92a29695cc..3444b58033c8 100644 --- a/trunk/mm/page_isolation.c +++ b/trunk/mm/page_isolation.c @@ -55,7 +55,7 @@ start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn) return 0; undo: for (pfn = start_pfn; - pfn <= undo_pfn; + pfn < undo_pfn; pfn += pageblock_nr_pages) unset_migratetype_isolate(pfn_to_page(pfn)); @@ -76,7 +76,7 @@ undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn) pfn < end_pfn; pfn += pageblock_nr_pages) { page = __first_valid_page(pfn, pageblock_nr_pages); - if (!page || get_pageblock_flags(page) != MIGRATE_ISOLATE) + if (!page || get_pageblock_migratetype(page) != MIGRATE_ISOLATE) continue; unset_migratetype_isolate(page); } @@ -126,7 +126,7 @@ int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn) */ for (pfn = start_pfn; pfn < end_pfn; pfn += pageblock_nr_pages) { page = __first_valid_page(pfn, pageblock_nr_pages); - if (page && get_pageblock_flags(page) != MIGRATE_ISOLATE) + if (page && get_pageblock_migratetype(page) != MIGRATE_ISOLATE) break; } if (pfn < end_pfn)