diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-31 11:42:13 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-31 11:42:13 -0800 |
commit | ddaefe8947b48b638f726cf89730ecc1000ebcc3 (patch) | |
tree | bb05a5fce7b944a25f63432be3c33d52e3b3cd02 /include/linux/module.h | |
parent | c5951e7c8ee5cb04b8b41c32bf567b90117a2124 (diff) | |
parent | 6080d608eeff7cb5090a2ddbaf723bfb0ff133fc (diff) | |
download | lwn-ddaefe8947b48b638f726cf89730ecc1000ebcc3.tar.gz lwn-ddaefe8947b48b638f726cf89730ecc1000ebcc3.zip |
Merge tag 'modules-for-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux
Pull module updates from Jessica Yu:
"Summary of modules changes for the 5.6 merge window:
- Add "MS" (SHF_MERGE|SHF_STRINGS) section flags to __ksymtab_strings
to indicate to the linker that it can perform string deduplication
(i.e., duplicate strings are reduced to a single copy in the string
table). This means any repeated namespace string would be merged to
just one entry in __ksymtab_strings.
- Various code cleanups and small fixes (fix small memleak in error
path, improve moduleparam docs, silence rcu warnings, improve error
logging)"
* tag 'modules-for-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
module.h: Annotate mod_kallsyms with __rcu
module: avoid setting info->name early in case we can fall back to info->mod->name
modsign: print module name along with error message
kernel/module: Fix memleak in module_add_modinfo_attrs()
export.h: reduce __ksymtab_strings string duplication by using "MS" section flags
moduleparam: fix kerneldoc
modules: lockdep: Suppress suspicious RCU usage warning
Diffstat (limited to 'include/linux/module.h')
-rw-r--r-- | include/linux/module.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 0c7366c317bd..edc63e6ff531 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -429,7 +429,7 @@ struct module { #ifdef CONFIG_KALLSYMS /* Protected by RCU and/or module_mutex: use rcu_dereference() */ - struct mod_kallsyms *kallsyms; + struct mod_kallsyms __rcu *kallsyms; struct mod_kallsyms core_kallsyms; /* Section attributes */ |