---

yaml --- r: 283410 b: refs/heads/master c: 73736e0 h: refs/heads/master v: v3
git-mirror · Dec 13, 2011 · cc17e99 · cc17e99
1 parent 87ba410
commit cc17e99
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25f4379b8c79066c4be0e5995f37f5265733b801
+refs/heads/master: 73736e0387ba0e6d2b703407b4d26168d31516a7
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
@@ -2169,6 +2169,11 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
 		goto new_slab;
 	}
 
+	/* must check again c->freelist in case of cpu migration or IRQ */
+	object = c->freelist;
+	if (object)
+		goto load_freelist;
+
 	stat(s, ALLOC_SLOWPATH);
 
 	do {