diff options
| author | Alexey Dobriyan <adobriyan@sw.ru> | 2007-05-08 00:28:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 11:15:08 -0700 |
| commit | a5c43dae7ae38c2a6b3e9a819bcf45f010bf6a4a (patch) | |
| tree | b30da7a4541e803e35a6a74ad33e836442c3f6c8 /mm | |
| parent | 9d65cb4a1718a072898c7a57a3bc61b2dc4bcd4d (diff) | |
| download | blackbird-op-linux-a5c43dae7ae38c2a6b3e9a819bcf45f010bf6a4a.tar.gz blackbird-op-linux-a5c43dae7ae38c2a6b3e9a819bcf45f010bf6a4a.zip | |
Fix race between cat /proc/slab_allocators and rmmod
Same story as with cat /proc/*/wchan race vs rmmod race, only
/proc/slab_allocators want more info than just symbol name.
Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
Acked-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slab.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/mm/slab.c b/mm/slab.c index 1115e2065bfc..acda7e2d66e4 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -4432,16 +4432,12 @@ static void handle_slab(unsigned long *n, struct kmem_cache *c, struct slab *s) static void show_symbol(struct seq_file *m, unsigned long address) { #ifdef CONFIG_KALLSYMS - char *modname; - const char *name; unsigned long offset, size; - char namebuf[KSYM_NAME_LEN+1]; - - name = kallsyms_lookup(address, &size, &offset, &modname, namebuf); + char modname[MODULE_NAME_LEN + 1], name[KSYM_NAME_LEN + 1]; - if (name) { + if (lookup_symbol_attrs(address, &size, &offset, modname, name) == 0) { seq_printf(m, "%s+%#lx/%#lx", name, offset, size); - if (modname) + if (modname[0]) seq_printf(m, " [%s]", modname); return; } |
