From ead670b5f74d960dbc7aca12b0a625ebbb521d89 Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Fri, 19 Oct 2012 09:33:11 -0300 Subject: [PATCH] --- yaml --- r: 346875 b: refs/heads/master c: fe74fe2bf293d061826f0d7afc2ca8456bdbb40e h: refs/heads/master i: 346873: 7426c000ee586c4e0fabf2f7c8ac60c3f5f892d4 346871: cc534b79a6812c3e2bfb20d587ec00ee5008c670 v: v3 --- [refs] | 2 +- trunk/mm/slob.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f3d5b55cbfcf..5859b7f727f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 999d8795d438d396936811b185428d70b7b7de6d +refs/heads/master: fe74fe2bf293d061826f0d7afc2ca8456bdbb40e diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c index 06a5ec70e728..287a88aa4a61 100644 --- a/trunk/mm/slob.c +++ b/trunk/mm/slob.c @@ -554,12 +554,12 @@ void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node) if (c->size < PAGE_SIZE) { b = slob_alloc(c->size, flags, c->align, node); - trace_kmem_cache_alloc_node(_RET_IP_, b, c->size, + trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size, SLOB_UNITS(c->size) * SLOB_UNIT, flags, node); } else { b = slob_new_pages(flags, get_order(c->size), node); - trace_kmem_cache_alloc_node(_RET_IP_, b, c->size, + trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size, PAGE_SIZE << get_order(c->size), flags, node); } @@ -606,7 +606,7 @@ EXPORT_SYMBOL(kmem_cache_free); unsigned int kmem_cache_size(struct kmem_cache *c) { - return c->size; + return c->object_size; } EXPORT_SYMBOL(kmem_cache_size);