diff --git a/[refs] b/[refs] index a6806a7c70d8..1fc78108d609 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6300ea75031e7aebfe3331245b7f750d82621223 +refs/heads/master: d45f39cb06610ea456e1d689149b9becacda8b40 diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index 03ae5490c3dd..a18708821c1e 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -1876,7 +1876,8 @@ static struct kmem_cache_node * __init early_kmem_cache_node_alloc(gfp_t gfpflag page->freelist = get_freepointer(kmalloc_caches, n); page->inuse++; kmalloc_caches->node[node] = n; - setup_object_debug(kmalloc_caches, page, n); + init_object(kmalloc_caches, n, 1); + init_tracking(kmalloc_caches, n); init_kmem_cache_node(n); atomic_long_inc(&n->nr_slabs); add_partial(n, page);