From 37143e977cf0ee407488519078a093eaaad44106 Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki Date: Fri, 29 Dec 2006 16:47:20 -0800 Subject: [PATCH] --- yaml --- r: 45103 b: refs/heads/master c: 96ac5913f4e45c6a1b98350f2c0a8bb3abe2646a h: refs/heads/master i: 45101: 03d83f6fd40114b2ed2420833beaebc01842b9d2 45099: 6a64febe24876a7377bdf3989728bea39a923051 45095: 67fbbd559c00883a22520cac8fb4e998b1d4989f 45087: 0a7558d8cead804d6b1ec01298bb461a07d5af39 v: v3 --- [refs] | 2 +- trunk/mm/oom_kill.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a460df2ebe77..81d0d6070294 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4e6bdbb426d1ecd9e4587f22115f8d0d426d21f +refs/heads/master: 96ac5913f4e45c6a1b98350f2c0a8bb3abe2646a diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c index 64cf3c214634..6969cfb33901 100644 --- a/trunk/mm/oom_kill.c +++ b/trunk/mm/oom_kill.c @@ -174,7 +174,12 @@ static inline int constrained_alloc(struct zonelist *zonelist, gfp_t gfp_mask) { #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))