diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-15 13:01:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-15 13:01:14 -0800 |
| commit | 1b59be2a6cdcb5a12e18d8315c07c94a624de48f (patch) | |
| tree | 5cf48d9f94d85e9b1f984610b6868ad100ca1916 /mm/slub.c | |
| parent | f9ee7f60d6f37ae0184812b4c59b3869f875768b (diff) | |
| parent | 2ed1c5257b5d669df2a64bd53e61dc19c7d936cd (diff) | |
| download | linux-1b59be2a6cdcb5a12e18d8315c07c94a624de48f.tar.gz linux-1b59be2a6cdcb5a12e18d8315c07c94a624de48f.tar.bz2 linux-1b59be2a6cdcb5a12e18d8315c07c94a624de48f.zip | |
Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
Update Pekka's email address in MAINTAINERS
mm/slab.c: make local symbols static
slub: Avoid use of slub_lock in show_slab_objects()
memory hotplug: one more lock on memory hotplug
Diffstat (limited to 'mm/slub.c')
| -rw-r--r-- | mm/slub.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/slub.c b/mm/slub.c index c7ef0070dd86..e15aa7f193c9 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -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"); } |