module: Make module_enable_ro() static again

Now that module_enable_ro() has no more external users, make it static
again.

Suggested-by: Jessica Yu <jeyu@kernel.org>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Acked-by: Jessica Yu <jeyu@kernel.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/include/linux/module.h b/include/linux/module.h
index e4ef7b36feda9a8d22b15688b79e5430ee820601..2c2e988bcf10ddaa8d3591e97364b25e844df4cc 100644 (file)
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -858,12 +858,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 3ba024afe379a57e3798254fbfda5ed310bd4d68..a26343ea4d502a8aceaabb619db830ad65b258d3 100644 (file)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1997,7 +1997,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;
@@ -2025,6 +2025,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)
 {