From 668e7623a636e37b29d5e0b047a142d9a1988493 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Tue, 9 Aug 2011 16:12:24 -0500 Subject: [PATCH] --- yaml --- r: 269303 b: refs/heads/master c: e6e82ea1127d899af7eee876f1c1103716d13772 h: refs/heads/master i: 269301: 1a2a7475fc977d1b291c863af98af9d1860b65a0 269299: 165e131e0ba97e085d2c51d353cd3830861ddc1c 269295: 201300e3ac8d4c733d7c90614b8ecb12bf1894e0 v: v3 --- [refs] | 2 +- trunk/mm/slub.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index dd2c80e3d166..a737b1ddafb0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7db0d7054048da140798d8bfdd7fff5f74f85abf +refs/heads/master: e6e82ea1127d899af7eee876f1c1103716d13772 diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index d4b76bea5dba..83bb81de4468 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -1447,7 +1447,7 @@ static struct page *new_slab(struct kmem_cache *s, gfp_t flags, int node) set_freepointer(s, last, NULL); page->freelist = start; - page->inuse = 0; + page->inuse = page->objects; page->frozen = 1; out: return page; @@ -2139,7 +2139,6 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, */ object = page->freelist; page->freelist = NULL; - page->inuse = page->objects; stat(s, ALLOC_SLAB); c->node = page_to_nid(page); @@ -2681,7 +2680,7 @@ static void early_kmem_cache_node_alloc(int node) n = page->freelist; BUG_ON(!n); page->freelist = get_freepointer(kmem_cache_node, n); - page->inuse++; + page->inuse = 1; page->frozen = 0; kmem_cache_node->node[node] = n; #ifdef CONFIG_SLUB_DEBUG