diff options
author | Alexey Dobriyan <adobriyan@sw.ru> | 2007-05-08 03:28:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:15:08 -0400 |
commit | a5c43dae7ae38c2a6b3e9a819bcf45f010bf6a4a (patch) | |
tree | b30da7a4541e803e35a6a74ad33e836442c3f6c8 /kernel/kallsyms.c | |
parent | 9d65cb4a1718a072898c7a57a3bc61b2dc4bcd4d (diff) |
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 'kernel/kallsyms.c')
-rw-r--r-- | kernel/kallsyms.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c index 4e2ec191a127..c36581b40c04 100644 --- a/kernel/kallsyms.c +++ b/kernel/kallsyms.c | |||
@@ -286,6 +286,25 @@ int lookup_symbol_name(unsigned long addr, char *symname) | |||
286 | return lookup_module_symbol_name(addr, symname); | 286 | return lookup_module_symbol_name(addr, symname); |
287 | } | 287 | } |
288 | 288 | ||
289 | int lookup_symbol_attrs(unsigned long addr, unsigned long *size, | ||
290 | unsigned long *offset, char *modname, char *name) | ||
291 | { | ||
292 | name[0] = '\0'; | ||
293 | name[KSYM_NAME_LEN] = '\0'; | ||
294 | |||
295 | if (is_ksym_addr(addr)) { | ||
296 | unsigned long pos; | ||
297 | |||
298 | pos = get_symbol_pos(addr, size, offset); | ||
299 | /* Grab name */ | ||
300 | kallsyms_expand_symbol(get_symbol_offset(pos), name); | ||
301 | modname[0] = '\0'; | ||
302 | return 0; | ||
303 | } | ||
304 | /* see if it's in a module */ | ||
305 | return lookup_module_symbol_attrs(addr, size, offset, modname, name); | ||
306 | } | ||
307 | |||
289 | /* Look up a kernel symbol and return it in a text buffer. */ | 308 | /* Look up a kernel symbol and return it in a text buffer. */ |
290 | int sprint_symbol(char *buffer, unsigned long address) | 309 | int sprint_symbol(char *buffer, unsigned long address) |
291 | { | 310 | { |