Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: module: don't call percpu_modfree on NULL pointer. module: fix memory leak when load fails after srcversion/version allocated module: preferred way to use MODULE_AUTHOR param: allow whitespace as kernel parameter separator module: reduce string table for loaded modules (v2) module: reduce symbol table for loaded modules (v2)
This commit is contained in:
commit
2c9871de0a
3 changed files with 165 additions and 18 deletions
|
@ -128,7 +128,10 @@ extern struct module __this_module;
|
|||
*/
|
||||
#define MODULE_LICENSE(_license) MODULE_INFO(license, _license)
|
||||
|
||||
/* Author, ideally of form NAME[, NAME]*[ and NAME] */
|
||||
/*
|
||||
* Author(s), use "Name <email>" or just "Name", for multiple
|
||||
* authors use multiple MODULE_AUTHOR() statements/lines.
|
||||
*/
|
||||
#define MODULE_AUTHOR(_author) MODULE_INFO(author, _author)
|
||||
|
||||
/* What your module does. */
|
||||
|
@ -308,10 +311,14 @@ struct module
|
|||
#endif
|
||||
|
||||
#ifdef CONFIG_KALLSYMS
|
||||
/* We keep the symbol and string tables for kallsyms. */
|
||||
Elf_Sym *symtab;
|
||||
unsigned int num_symtab;
|
||||
char *strtab;
|
||||
/*
|
||||
* We keep the symbol and string tables for kallsyms.
|
||||
* The core_* fields below are temporary, loader-only (they
|
||||
* could really be discarded after module init).
|
||||
*/
|
||||
Elf_Sym *symtab, *core_symtab;
|
||||
unsigned int num_symtab, core_num_syms;
|
||||
char *strtab, *core_strtab;
|
||||
|
||||
/* Section attributes */
|
||||
struct module_sect_attrs *sect_attrs;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue