diff options
author | Pekka Enberg <penberg@kernel.org> | 2011-01-15 11:28:17 (GMT) |
---|---|---|
committer | Pekka Enberg <penberg@kernel.org> | 2011-01-15 11:28:17 (GMT) |
commit | 597fb188cbee2d371246e1669bbc6051bb666aa9 (patch) | |
tree | fd9cb605050ca15274cf391dc6bd4073d04808df /mm/slub.c | |
parent | 38567333a6dabd0f2b4150e9fb6dd8e3ba2985e5 (diff) | |
parent | 04d94879c8a4973b5499dc26b9d38acee8928791 (diff) | |
download | linux-fsl-qoriq-597fb188cbee2d371246e1669bbc6051bb666aa9.tar.xz |
Merge branch 'slub/hotplug' into slab/urgent
Diffstat (limited to 'mm/slub.c')
-rw-r--r-- | mm/slub.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3797,7 +3797,7 @@ static ssize_t show_slab_objects(struct kmem_cache *s, } } - down_read(&slub_lock); + lock_memory_hotplug(); #ifdef CONFIG_SLUB_DEBUG if (flags & SO_ALL) { for_each_node_state(node, N_NORMAL_MEMORY) { @@ -3838,7 +3838,7 @@ static ssize_t show_slab_objects(struct kmem_cache *s, x += sprintf(buf + x, " N%d=%lu", node, nodes[node]); #endif - up_read(&slub_lock); + unlock_memory_hotplug(); kfree(nodes); return x + sprintf(buf + x, "\n"); } |