diff --git a/[refs] b/[refs] index 04138d4ad102..58ae08dfbaff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d29eff7bca60c9ee401d691d4562a4abca8de543 +refs/heads/master: 1cd7daa51baf0934882bf24a7ae378ec75df665e diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index addb20a6d67d..0eab12bd0ac9 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -1878,8 +1878,8 @@ static void init_kmem_cache_node(struct kmem_cache_node *n) * Note that this function only works on the kmalloc_node_cache * when allocating for the kmalloc_node_cache. */ -static struct kmem_cache_node * __init early_kmem_cache_node_alloc(gfp_t gfpflags, - int node) +static struct kmem_cache_node *early_kmem_cache_node_alloc(gfp_t gfpflags, + int node) { struct page *page; struct kmem_cache_node *n;