Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slub: Fix slub_lock down/up imbalance

+2 -1
+2 -1
mm/slub.c
··· 3273 3273 kfree(n); 3274 3274 kfree(s); 3275 3275 } 3276 + err: 3276 3277 up_write(&slub_lock); 3277 3278 3278 - err: 3279 3279 if (flags & SLAB_PANIC) 3280 3280 panic("Cannot create slabcache %s\n", name); 3281 3281 else ··· 3862 3862 x += sprintf(buf + x, " N%d=%lu", 3863 3863 node, nodes[node]); 3864 3864 #endif 3865 + up_read(&slub_lock); 3865 3866 kfree(nodes); 3866 3867 return x + sprintf(buf + x, "\n"); 3867 3868 }