---

yaml --- r: 248625 b: refs/heads/master c: bd07d87 h: refs/heads/master i: 248623: 0b97740 v: v3
git-mirror · May 17, 2011 · 8f41be1 · 8f41be1
1 parent f04ff79
commit 8f41be1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1393d9a1857471f816d0be1ccc1d6433a86050f6
+refs/heads/master: bd07d87fd4b8a6af9820544b6bc6c37215d6f8ad
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
@@ -1845,7 +1845,6 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
 	page = get_partial(s, gfpflags, node);
 	if (page) {
 		stat(s, ALLOC_FROM_PARTIAL);
-load_from_page:
 		c->node = page_to_nid(page);
 		c->page = page;
 		goto load_freelist;
@@ -1868,8 +1867,9 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
 
 		slab_lock(page);
 		__SetPageSlubFrozen(page);
-
-		goto load_from_page;
+		c->node = page_to_nid(page);
+		c->page = page;
+		goto load_freelist;
 	}
 	if (!(gfpflags & __GFP_NOWARN) && printk_ratelimit())
 		slab_out_of_memory(s, gfpflags, node);