From 882b60f48b9b8ad0132e4b2747e4f8b428d65702 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 27 Oct 2010 19:33:43 +0200
Subject: [PATCH] --- yaml --- r: 219541 b: refs/heads/master c:
 800416f799e0723635ac2d720ad4449917a1481c h: refs/heads/master i:   219539:
 32369bad762e0ab3cc5e04bc12408655fadf3173 v: v3

---
 [refs]               | 2 +-
 trunk/mm/mempolicy.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6748c1ae490f..0c89687495c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0851668fdd97e526b2a41f794b785c204dd3d3e0
+refs/heads/master: 800416f799e0723635ac2d720ad4449917a1481c
diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c
index 81a127643aea..4a57f135b76e 100644
--- a/trunk/mm/mempolicy.c
+++ b/trunk/mm/mempolicy.c
@@ -1597,7 +1597,7 @@ unsigned slab_node(struct mempolicy *policy)
 		(void)first_zones_zonelist(zonelist, highest_zoneidx,
 							&policy->v.nodes,
 							&zone);
-		return zone->node;
+		return zone ? zone->node : numa_node_id();
 	}
 
 	default: