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 /include/linux | |
| 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 'include/linux')
| -rw-r--r-- | include/linux/kallsyms.h | 6 | ||||
| -rw-r--r-- | include/linux/module.h | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h index ae0117a95cf..12178d2c882 100644 --- a/include/linux/kallsyms.h +++ b/include/linux/kallsyms.h @@ -31,6 +31,7 @@ extern int sprint_symbol(char *buffer, unsigned long address); extern void __print_symbol(const char *fmt, unsigned long address); int lookup_symbol_name(unsigned long addr, char *symname); +int lookup_symbol_attrs(unsigned long addr, unsigned long *size, unsigned long *offset, char *modname, char *name); #else /* !CONFIG_KALLSYMS */ @@ -65,6 +66,11 @@ static inline int lookup_symbol_name(unsigned long addr, char *symname) return -ERANGE; } +static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, unsigned long *offset, char *modname, char *name) +{ + return -ERANGE; +} + /* Stupid that this does nothing, but I didn't create this mess. */ #define __print_symbol(fmt, addr) #endif /*CONFIG_KALLSYMS*/ diff --git a/include/linux/module.h b/include/linux/module.h index 099ae5932c6..6d3dc9c4ff9 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -455,6 +455,7 @@ const char *module_address_lookup(unsigned long addr, unsigned long *offset, char **modname); int lookup_module_symbol_name(unsigned long addr, char *symname); +int lookup_module_symbol_attrs(unsigned long addr, unsigned long *size, unsigned long *offset, char *modname, char *name); /* For extable.c to search modules' exception tables. */ const struct exception_table_entry *search_module_extables(unsigned long addr); @@ -531,6 +532,11 @@ static inline int lookup_module_symbol_name(unsigned long addr, char *symname) return -ERANGE; } +static inline int lookup_module_symbol_attrs(unsigned long addr, unsigned long *size, unsigned long *offset, char *modname, char *name) +{ + return -ERANGE; +} + static inline int module_get_kallsym(unsigned int symnum, unsigned long *value, char *type, char *name, char *module_name, int *exported) |