The patch titled
: Fix memory hotplug + sparsemem build.
has been removed from the -mm tree. Its filename was
update-n_high_memory-node-state-for-memory-hotadd-fix.patch
This patch was dropped because it was folded into memoryless-nodes-introduce-mask-of-nodes-with-memory.patch
------------------------------------------------------
Subject: : Fix memory hotplug + sparsemem build.
From: Yasunori Goto <y-goto@xxxxxxxxxxxxxx>
Fix kswapd doesn't run when memory is added on memory-less-node.
Fix compile error of zone->node when CONFIG_NUMA is off.
Signed-off-by: Yasunori Goto <y-goto@xxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
Acked-by: Andy Whitcroft <apw@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memory_hotplug.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff -puN mm/memory_hotplug.c~update-n_high_memory-node-state-for-memory-hotadd-fix mm/memory_hotplug.c
--- a/mm/memory_hotplug.c~update-n_high_memory-node-state-for-memory-hotadd-fix
+++ a/mm/memory_hotplug.c
@@ -215,10 +215,12 @@ int online_pages(unsigned long pfn, unsi
}
zone->present_pages += onlined_pages;
zone->zone_pgdat->node_present_pages += onlined_pages;
- if (onlined_pages)
- node_set_state(zone->node, N_HIGH_MEMORY);
setup_per_zone_pages_min();
+ if (onlined_pages) {
+ kswapd_run(zone_to_nid(zone));
+ node_set_state(zone_to_nid(zone), N_HIGH_MEMORY);
+ }
if (need_zonelists_rebuild)
build_all_zonelists();
@@ -273,9 +275,6 @@ int add_memory(int nid, u64 start, u64 s
if (!pgdat)
return -ENOMEM;
new_pgdat = 1;
- ret = kswapd_run(nid);
- if (ret)
- goto error;
}
/* call arch's memory hotadd */
_
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
update-n_high_memory-node-state-for-memory-hotadd-fix.patch
memoryless-nodes-fixup-uses-of-node_online_map-in-generic-code-fix.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-unplug-v7-page-offline-fix.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
