Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6

[~andy/linux] / mm / slub.c

diff --git a/mm/slub.c b/mm/slub.c
index 4aad32d2e60d22b659efa63f8728e67d1ce7f1e1..7be0223531b090dbd9f716104714bc4d9ca9c7b5 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1831,7 +1831,6 @@ load_freelist:
        page->inuse = page->objects;
        page->freelist = NULL;
 
-unlock_out:
        slab_unlock(page);
        c->tid = next_tid(c->tid);
        local_irq_restore(flags);