diff --git a/[refs] b/[refs] index 84f41ceff542..40a1a05c0d33 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1393d9a1857471f816d0be1ccc1d6433a86050f6 +refs/heads/master: bd07d87fd4b8a6af9820544b6bc6c37215d6f8ad diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index 97bb5b8d935f..9f7bb93e17ec 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -1845,7 +1845,6 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, page = get_partial(s, gfpflags, node); if (page) { stat(s, ALLOC_FROM_PARTIAL); -load_from_page: c->node = page_to_nid(page); c->page = page; goto load_freelist; @@ -1868,8 +1867,9 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, slab_lock(page); __SetPageSlubFrozen(page); - - goto load_from_page; + c->node = page_to_nid(page); + c->page = page; + goto load_freelist; } if (!(gfpflags & __GFP_NOWARN) && printk_ratelimit()) slab_out_of_memory(s, gfpflags, node);