From 94d5fade6016d93b07840ecfca627e4ecffc11d9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 23 Jun 2020 14:33:13 +0200 Subject: [PATCH] Revert "Revert "module: Make module_enable_ro() static again"" This reverts commit 95a06095ff3e280f35a69858a69857c1953dfbd3 as it should now be resolved. Signed-off-by: Greg Kroah-Hartman Change-Id: I521215f77e69ac4d26d4977d2a16a40298d96509 --- include/linux/module.h | 6 ------ kernel/module.c | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/linux/module.h b/include/linux/module.h index 3e2a33b7a66d..b28a9eb76e70 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -873,12 +873,6 @@ extern int module_sysfs_initialized; #define __MODULE_STRING(x) __stringify(x) -#ifdef CONFIG_STRICT_MODULE_RWX -extern void module_enable_ro(const struct module *mod, bool after_init); -#else -static inline void module_enable_ro(const struct module *mod, bool after_init) { } -#endif - #ifdef CONFIG_GENERIC_BUG void module_bug_finalize(const Elf_Ehdr *, const Elf_Shdr *, struct module *); diff --git a/kernel/module.c b/kernel/module.c index 76adc8e0ed10..cd215580fb45 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -2000,7 +2000,7 @@ static void frob_writable_data(const struct module_layout *layout, (layout->size - layout->ro_after_init_size) >> PAGE_SHIFT); } -void module_enable_ro(const struct module *mod, bool after_init) +static void module_enable_ro(const struct module *mod, bool after_init) { if (!rodata_enabled) return; @@ -2028,6 +2028,7 @@ static void module_enable_nx(const struct module *mod) #else /* !CONFIG_STRICT_MODULE_RWX */ static void module_enable_nx(const struct module *mod) { } +static void module_enable_ro(const struct module *mod, bool after_init) {} #endif /* CONFIG_STRICT_MODULE_RWX */ static void module_enable_x(const struct module *mod) {