Merge tag 'modules-for-v5.15-rc6' of git://

Pull modules fix from Jessica Yu:

 - Build fix for cfi_init() when CONFIG_MODULE_UNLOAD=n

* tag 'modules-for-v5.15-rc6' of git://
  module: fix clang CFI with MODULE_UNLOAD=n
diff --git a/kernel/module.c b/kernel/module.c
index 40ec9a0..5c26a76 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -4489,8 +4489,10 @@
 	/* Fix init/exit functions to point to the CFI jump table */
 	if (init)
 		mod->init = *init;
 	if (exit)
 		mod->exit = *exit;
 	cfi_module_add(mod, module_addr_min);