The patch titled fix oom killer kills current every time if there is memory-less-node take2 has been added to the -mm tree. Its filename is fix-oom-killer-kills-current-every-time-if-there-is.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: fix oom killer kills current every time if there is memory-less-node take2 From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> constrained_alloc(), which is called to detect where oom is from, checks passed zone_list(). If zone_list doesn't include all nodes, it thinks oom is from mempolicy. But there is memory-less-node. memory-less-node's zones are never included in zonelist[]. contstrained_alloc() should get memory_less_node into count. Otherwise, it always thinks 'oom is from mempolicy'. This means that current process dies at any time. This patch fix it. Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: Paul Jackson <pj@xxxxxxx> Cc: Christoph Lameter <clameter@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- mm/oom_kill.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff -puN mm/oom_kill.c~fix-oom-killer-kills-current-every-time-if-there-is mm/oom_kill.c --- a/mm/oom_kill.c~fix-oom-killer-kills-current-every-time-if-there-is +++ a/mm/oom_kill.c @@ -174,7 +174,12 @@ static inline int constrained_alloc(stru { #ifdef CONFIG_NUMA struct zone **z; - nodemask_t nodes = node_online_map; + nodemask_t nodes; + int node; + /* node has memory ? */ + for_each_online_node(node) + if (NODE_DATA(node)->node_present_pages) + node_set(node, nodes); for (z = zonelist->zones; *z; z++) if (cpuset_zone_allowed_softwall(*z, gfp_mask)) _ Patches currently in -mm which might be from kamezawa.hiroyu@xxxxxxxxxxxxxx are fix-oom-killer-kills-current-every-time-if-there-is.patch mm-only-sched-add-a-few-scheduler-event-counters.patch reiser4-hardirq-include-fix.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