diff --git a/[refs] b/[refs] index 5b2094c6c418..7c130ef141a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03e404af26dc2ea0d278d7a342de0aab394793ce +refs/heads/master: 4eade540fc35353813097bfdb39465c9b8847a15 diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index 25dac48c1c60..78c488202f7d 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -1997,9 +1997,6 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, NULL, new.counters, "__slab_alloc")); -load_freelist: - VM_BUG_ON(!page->frozen); - if (unlikely(!object)) { c->page = NULL; stat(s, DEACTIVATE_BYPASS); @@ -2008,6 +2005,8 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, stat(s, ALLOC_REFILL); +load_freelist: + VM_BUG_ON(!page->frozen); c->freelist = get_freepointer(s, object); c->tid = next_tid(c->tid); local_irq_restore(flags);