From: Christoph Lameter <clameter@sgi.com>

I found another situation where one can use zone_to_nid to clarify
the source.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 mm/oom_kill.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

diff -puN mm/oom_kill.c~numa-add-zone_to_nid-function-update mm/oom_kill.c
--- a/mm/oom_kill.c~numa-add-zone_to_nid-function-update
+++ a/mm/oom_kill.c
@@ -177,8 +177,7 @@ static inline int constrained_alloc(stru
 
 	for (z = zonelist->zones; *z; z++)
 		if (cpuset_zone_allowed(*z, gfp_mask))
-			node_clear((*z)->zone_pgdat->node_id,
-					nodes);
+			node_clear(zone_to_nid(*z), nodes);
 		else
 			return CONSTRAINT_CPUSET;
 
_