The patch titled
Subject: mm-compaction-speed-up-pageblock_pfn_to_page-when-zone-is-contiguous-fix
has been removed from the -mm tree. Its filename was
mm-compaction-speed-up-pageblock_pfn_to_page-when-zone-is-contiguous-fix.patch
This patch was dropped because it was folded into mm-compaction-speed-up-pageblock_pfn_to_page-when-zone-is-contiguous.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-compaction-speed-up-pageblock_pfn_to_page-when-zone-is-contiguous-fix
don't forget to restore zone->contiguous on error path, per Vlastimil
Cc: Aaron Lu <aaron.lu@xxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Cc: Mel Gorman <mgorman@xxxxxxx>
Cc: Rik van Riel <riel@xxxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memory_hotplug.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN mm/memory_hotplug.c~mm-compaction-speed-up-pageblock_pfn_to_page-when-zone-is-contiguous-fix mm/memory_hotplug.c
--- a/mm/memory_hotplug.c~mm-compaction-speed-up-pageblock_pfn_to_page-when-zone-is-contiguous-fix
+++ a/mm/memory_hotplug.c
@@ -526,7 +526,8 @@ int __ref __add_pages(int nid, struct zo
if (altmap->base_pfn != phys_start_pfn
|| vmem_altmap_offset(altmap) > nr_pages) {
pr_warn_once("memory add fail, invalid altmap\n");
- return -EINVAL;
+ err = -EINVAL;
+ goto out;
}
altmap->alloc = 0;
}
@@ -544,9 +545,8 @@ int __ref __add_pages(int nid, struct zo
err = 0;
}
vmemmap_populate_print_last();
-
+out:
set_zone_contiguous(zone);
-
return err;
}
EXPORT_SYMBOL_GPL(__add_pages);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
fs-mpagec-mpage_readpages-use-lru_to_page-helper.patch
mm-page_allocc-rework-code-layout-in-memmap_init_zone.patch
mm-compaction-speed-up-pageblock_pfn_to_page-when-zone-is-contiguous.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
