mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-22 17:33:01 +00:00
Modules updates for v4.12
Summary of modules changes for the 4.12 merge window: - Minor code cleanups - Fix section alignment for .init_array Signed-off-by: Jessica Yu <jeyu@redhat.com> -----BEGIN PGP SIGNATURE----- iQIcBAABCgAGBQJZClptAAoJEMBFfjjOO8FygIkP/iUB2+Ek2i5aD5w5cLpJ3Sm3 w5DnoSLLHATd64TmvtwIv1UUHJMkUv7Ls9soz7aegxETzp6E1RCRwGxH7FZfuEk7 T8wPiOzhr76rEylr0y7iSYjRv3j5x9PKY5mUejldeiUGIS5crGG14wvnVFzOPIJQ Y2J7pjCPKLgtDxIHfBZFV/ut8TEaepf3du/qGi8UDqxEexEiBixXq3VGOqP/YmYt earCKOU1EhHCIo7LDU4QvrK/6vWq1Ip7yzRtho/LHsgtNeRg5sQ9DO12HvylvXUo IRYLW2yKM9RZnw2XNVt4mHt6zCDTK3gshfLg5SiCBr4AWP5JMX4GLF/w+YpC11tt Ec2M9S9xqWuk5z6rhJyHcEsRgzfDRYRrz79c0wvH+fqKL6kwj7CSPudGkbFIQCXy LjDEe/Fk0RPDSUzHSDpQJWf3u3/mD5rwAcX3X673mRyc9mmm/HzNDOOxJV0EuO6G J2qhjO5a0vLlZ4tpd4uKUgoO9x8jc2Y3jV8wDDDRfOWwr6DD399l20/wnJ9VUkcN 55rQsmKCHEf+5SyGwXUcVsICy1jBg+rfg/SnSBhCrP07uGYz+iGSQ+FZ3xaBCj3f SY/9sAACA3Tn/tTJCY+ncj71oTigTRxU3aYlfqoiwIp/lIpC+gd567SUKssUQmi7 RhAC280Y6SNEB6iK2t7I =Z/Mw -----END PGP SIGNATURE----- Merge tag 'modules-for-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux Pull modules updates from Jessica Yu: - Minor code cleanups - Fix section alignment for .init_array * tag 'modules-for-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux: kallsyms: Use bounded strnchr() when parsing string module: Unify the return value type of try_module_get module: set .init_array alignment to 8
This commit is contained in:
commit
a1be8edda4
@ -583,7 +583,7 @@ extern bool try_module_get(struct module *module);
|
||||
extern void module_put(struct module *module);
|
||||
|
||||
#else /*!CONFIG_MODULE_UNLOAD*/
|
||||
static inline int try_module_get(struct module *module)
|
||||
static inline bool try_module_get(struct module *module)
|
||||
{
|
||||
return !module || module_is_live(module);
|
||||
}
|
||||
@ -680,9 +680,9 @@ static inline void __module_get(struct module *module)
|
||||
{
|
||||
}
|
||||
|
||||
static inline int try_module_get(struct module *module)
|
||||
static inline bool try_module_get(struct module *module)
|
||||
{
|
||||
return 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
static inline void module_put(struct module *module)
|
||||
|
@ -4035,7 +4035,7 @@ unsigned long module_kallsyms_lookup_name(const char *name)
|
||||
|
||||
/* Don't lock: we're in enough trouble already. */
|
||||
preempt_disable();
|
||||
if ((colon = strchr(name, ':')) != NULL) {
|
||||
if ((colon = strnchr(name, MODULE_NAME_LEN, ':')) != NULL) {
|
||||
if ((mod = find_module_all(name, colon - name, false)) != NULL)
|
||||
ret = mod_find_symname(mod, colon+1);
|
||||
} else {
|
||||
|
@ -20,8 +20,7 @@ SECTIONS {
|
||||
__kcrctab_unused_gpl 0 : { *(SORT(___kcrctab_unused_gpl+*)) }
|
||||
__kcrctab_gpl_future 0 : { *(SORT(___kcrctab_gpl_future+*)) }
|
||||
|
||||
. = ALIGN(8);
|
||||
.init_array 0 : { *(SORT(.init_array.*)) *(.init_array) }
|
||||
.init_array 0 : ALIGN(8) { *(SORT(.init_array.*)) *(.init_array) }
|
||||
|
||||
__jump_table 0 : ALIGN(8) { KEEP(*(__jump_table)) }
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user