aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/module/Makefile
diff options
context:
space:
mode:
authorChristophe Leroy <christophe.leroy@csgroup.eu>2022-02-23 10:00:59 +0100
committerLuis Chamberlain <mcgrof@kernel.org>2022-04-05 08:43:04 -0700
commit32a08c17d8096f0fd2c6600bc5fe8464aaf68ea7 (patch)
treeca8c7a86bf5a6a83cf56d96f1cdf42353dd28dd3 /kernel/module/Makefile
parentmodule: Make module_enable_x() independent of CONFIG_ARCH_HAS_STRICT_MODULE_RWX (diff)
downloadlinux-dev-32a08c17d8096f0fd2c6600bc5fe8464aaf68ea7.tar.xz
linux-dev-32a08c17d8096f0fd2c6600bc5fe8464aaf68ea7.zip
module: Move module_enable_x() and frob_text() in strict_rwx.c
Move module_enable_x() together with module_enable_nx() and module_enable_ro(). Those three functions are going together, they are all used to set up the correct page flags on the different sections. As module_enable_x() is used independently of CONFIG_STRICT_MODULE_RWX, build strict_rwx.c all the time and use IS_ENABLED(CONFIG_STRICT_MODULE_RWX) when relevant. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Diffstat (limited to 'kernel/module/Makefile')
-rw-r--r--kernel/module/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/module/Makefile b/kernel/module/Makefile
index e2eff9853a28..d1ca799c12e2 100644
--- a/kernel/module/Makefile
+++ b/kernel/module/Makefile
@@ -7,12 +7,11 @@
# and produce insane amounts of uninteresting coverage.
KCOV_INSTRUMENT_module.o := n
-obj-y += main.o
+obj-y += main.o strict_rwx.o
obj-$(CONFIG_MODULE_DECOMPRESS) += decompress.o
obj-$(CONFIG_MODULE_SIG) += signing.o
obj-$(CONFIG_LIVEPATCH) += livepatch.o
obj-$(CONFIG_MODULES_TREE_LOOKUP) += tree_lookup.o
-obj-$(CONFIG_STRICT_MODULE_RWX) += strict_rwx.o
obj-$(CONFIG_DEBUG_KMEMLEAK) += debug_kmemleak.o
obj-$(CONFIG_KALLSYMS) += kallsyms.o
obj-$(CONFIG_PROC_FS) += procfs.o