diff --git a/[refs] b/[refs] index b47511e68ba1..7e55f70c8166 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 925268a06dc2b1ff7bfcc37419a6827a0e739639 +refs/heads/master: 04d94879c8a4973b5499dc26b9d38acee8928791 diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index bec0e355fbad..96e690717822 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -3821,7 +3821,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) { @@ -3862,7 +3862,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"); }