From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 Oct 2021 14:42:07 +0000 (-0700)
Subject: Merge tag 'modules-for-v5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~95
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=348949d9a4440abdab3b1dc99a9bb660e8c7da7c;hp=f4d0cc426f77df6890aa868f96c2de89686aae8a;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'modules-for-v5.15-rc6' of git://git./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
---

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 @@ static void cfi_init(struct module *mod)
 	/* Fix init/exit functions to point to the CFI jump table */
 	if (init)
 		mod->init = *init;
+#ifdef CONFIG_MODULE_UNLOAD
 	if (exit)
 		mod->exit = *exit;
+#endif
 
 	cfi_module_add(mod, module_addr_min);
 #endif