If system can create movable node which all memory of the
node is allocated as ZONE_MOVABLE, setup_node_data() cannot
allocate memory for the node's pg_data_t.
So when memblock_alloc_nid() fails, setup_node_data() retries
memblock_alloc().
---
arch/x86/mm/numa.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
Index: linux-3.4-rc6/arch/x86/mm/numa.c
===================================================================
--- linux-3.4-rc6.orig/arch/x86/mm/numa.c 2012-05-15 06:43:38.887962970 +0900
+++ linux-3.4-rc6/arch/x86/mm/numa.c 2012-05-15 06:43:42.422918776 +0900
@@ -223,9 +223,13 @@ static void __init setup_node_data(int n
remapped = true;
} else {
nd_pa = memblock_alloc_nid(nd_size, SMP_CACHE_BYTES, nid);
- if (!nd_pa) {
- pr_err("Cannot find %zu bytes in node %d\n",
+ if (!nd_pa)
+ printk(KERN_WARNING "Cannot find %zu bytes in node %d\n",
nd_size, nid);
+ nd_pa = memblock_alloc(nd_size, SMP_CACHE_BYTES);
+ if (!nd_pa) {
+ pr_err("Cannot find %zu bytes in other node\n",
+ nd_size);
return;
}
nd = __va(nd_pa);
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>