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: