The patch titled OOM: use the N_MEMORY map instead of constructing one on the fly has been added to the -mm tree. Its filename is oom-use-the-n_memory-map-instead-of-constructing-one-on-the-fly.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: OOM: use the N_MEMORY map instead of constructing one on the fly From: Lee Schermerhorn <lee.schermerhorn@xxxxxx> constrained_alloc() builds its own memory map for nodes with memory. We have that available in node_memory_map now. So simplify the code. Signed-off-by: Christoph Lameter <clameter@xxxxxxx> Acked-by: Nishanth Aravamudan <nacc@xxxxxxxxxx> Acked-by: Lee Schermerhorn <lee.schermerhorn@xxxxxx> Acked-by: Bob Picco <bob.picco@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/oom_kill.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff -puN mm/oom_kill.c~oom-use-the-n_memory-map-instead-of-constructing-one-on-the-fly mm/oom_kill.c --- a/mm/oom_kill.c~oom-use-the-n_memory-map-instead-of-constructing-one-on-the-fly +++ a/mm/oom_kill.c @@ -176,14 +176,7 @@ static inline int constrained_alloc(stru { #ifdef CONFIG_NUMA struct zone **z; - nodemask_t nodes; - int node; - - nodes_clear(nodes); - /* node has memory ? */ - for_each_online_node(node) - if (NODE_DATA(node)->node_present_pages) - node_set(node, nodes); + nodemask_t nodes = node_states[N_MEMORY]; for (z = zonelist->zones; *z; z++) if (cpuset_zone_allowed_softwall(*z, gfp_mask)) _ Patches currently in -mm which might be from lee.schermerhorn@xxxxxx are numa-generic-management-of-nodemasks-for-various-purposes.patch memoryless-nodes-introduce-mask-of-nodes-with-memory.patch memoryless-nodes-fix-interleave-behavior.patch oom-use-the-n_memory-map-instead-of-constructing-one-on-the-fly.patch memoryless-nodes-no-need-for-kswapd.patch memoryless-node-slab-support.patch memoryless-nodes-slub-support.patch uncached-allocator-handle-memoryless-nodes.patch memoryless-node-allow-profiling-data-to-fall-back-to-other-nodes.patch memoryless-nodes-update-memory-policy-and-page-migration.patch add-n_cpu-node-state.patch memoryless-nodes-fix-gfp_thisnode-behavior.patch memoryless-nodes-use-node_memory_map-for-cpusets.patch memoryless-nodes-drop-one-memoryless-node-boot-warning.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