diff --git a/[refs] b/[refs] index 3bf0bb953d00..180f249f48bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aca726a07a71ff7aedc0e90a91f80a2701adcca5 +refs/heads/master: 12d79634f8d7af5229b7d21143d50e7cf7d94177 diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index 0e286acef62a..4982fb5c91de 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -1600,7 +1600,6 @@ static void *get_partial_node(struct kmem_cache *s, { struct page *page, *page2; void *object = NULL; - int count = 0; /* * Racy check. If we mistakenly see no partial slabs then we @@ -1613,17 +1612,16 @@ static void *get_partial_node(struct kmem_cache *s, spin_lock(&n->list_lock); list_for_each_entry_safe(page, page2, &n->partial, lru) { - void *t = acquire_slab(s, n, page, count == 0); + void *t = acquire_slab(s, n, page, object == NULL); int available; if (!t) break; - if (!count) { + if (!object) { c->page = page; c->node = page_to_nid(page); stat(s, ALLOC_FROM_PARTIAL); - count++; object = t; available = page->objects - page->inuse; } else {