lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'slub/hotplug' into slab/urgent

Browse Source
This commit is contained in:
Pekka Enberg
2011-01-15 13:28:17 +02:00
parent 38567333a6 04d94879c8
commit 597fb188cb
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mm/slub.c
View File

@ -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");
}