Commit 348949d9 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'modules-for-v5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

Pull modules fix from Jessica Yu:

 - Build fix for cfi_init() when CONFIG_MODULE_UNLOAD=n

* tag 'modules-for-v5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
  module: fix clang CFI with MODULE_UNLOAD=n
parents f4d0cc42 0d67e332
...@@ -4489,8 +4489,10 @@ static void cfi_init(struct module *mod) ...@@ -4489,8 +4489,10 @@ static void cfi_init(struct module *mod)
/* Fix init/exit functions to point to the CFI jump table */ /* Fix init/exit functions to point to the CFI jump table */
if (init) if (init)
mod->init = *init; mod->init = *init;
#ifdef CONFIG_MODULE_UNLOAD
if (exit) if (exit)
mod->exit = *exit; mod->exit = *exit;
#endif
cfi_module_add(mod, module_addr_min); cfi_module_add(mod, module_addr_min);
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment