---

yaml --- r: 219541 b: refs/heads/master c: 800416f h: refs/heads/master i: 219539: 32369ba v: v3
git-mirror · Oct 28, 2010 · 882b60f · 882b60f
1 parent 2534766
commit 882b60f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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: