The patch titled
Tiny update for hot-add with sparsemem-vmemmap
has been removed from the -mm tree. Its filename was
memory-hotplug-hot-add-with-sparsemem-vmemmap-update.patch
This patch was dropped because it was folded into memory-hotplug-hot-add-with-sparsemem-vmemmap.patch
------------------------------------------------------
Subject: Tiny update for hot-add with sparsemem-vmemmap
From: Yasunori Goto <y-goto@xxxxxxxxxxxxxx>
This is tiny update for Mel-san's comment about
memory hotplug with sparse-vmemmap.
- Add __meminit to sparse_mem_map_populate()
- Add a comment.
Signed-off-by: Yasunori Goto <y-goto@xxxxxxxxxxxxxx>
Cc: Andy Whitcroft <apw@xxxxxxxxxxxx>
Cc: Christoph Lameter <clameter@xxxxxxx>
Cc: Mel Gorman <mel@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/sparse-vmemmap.c | 2 +-
mm/sparse.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff -puN mm/sparse-vmemmap.c~memory-hotplug-hot-add-with-sparsemem-vmemmap-update mm/sparse-vmemmap.c
--- a/mm/sparse-vmemmap.c~memory-hotplug-hot-add-with-sparsemem-vmemmap-update
+++ a/mm/sparse-vmemmap.c
@@ -137,7 +137,7 @@ int __meminit vmemmap_populate_basepages
return 0;
}
-struct page *sparse_mem_map_populate(unsigned long pnum, int nid)
+struct page * __meminit sparse_mem_map_populate(unsigned long pnum, int nid)
{
struct page *map = pfn_to_page(pnum * PAGES_PER_SECTION);
int error = vmemmap_populate(map, PAGES_PER_SECTION, nid);
diff -puN mm/sparse.c~memory-hotplug-hot-add-with-sparsemem-vmemmap-update mm/sparse.c
--- a/mm/sparse.c~memory-hotplug-hot-add-with-sparsemem-vmemmap-update
+++ a/mm/sparse.c
@@ -326,6 +326,7 @@ void __init sparse_init(void)
static inline struct page *kmalloc_section_memmap(unsigned long pnum, int nid,
unsigned long nr_pages)
{
+ /* This will make the necessary allocations eventually. */
return sparse_mem_map_populate(pnum, nid);
}
static void __kfree_section_memmap(struct page *memmap, unsigned long nr_pages)
_
Patches currently in -mm which might be from y-goto@xxxxxxxxxxxxxx are
clean-up-duplicate-includes-in-include-linux-memory_hotplugh.patch
memoryless-nodes-introduce-mask-of-nodes-with-memory.patch
fix-panic-of-cpu-online-with-memory-less-node.patch
move-free-pages-between-lists-on-steal.patch
memory-unplug-v7-page-isolation.patch
memory-unplug-v7-page-offline.patch
memory-hotplug-hot-add-with-sparsemem-vmemmap.patch
memory-hotplug-hot-add-with-sparsemem-vmemmap-update.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
