History

module: Make module_enable_ro() static again

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

Josh Poimboeuf committed 6 years ago

Commit e6eff431 parent 5b384f92 files · +2 −7Browse files

Unified · Split

2 files
  1. include/linux/module.h +0 −6
  2. kernel/module.c +2 −1
include/linux/module.h+0−6
@@ -858,12 +858,6 @@ extern int module_sysfs_initialized; · 857 unmodified lines
858858
859859 #define __MODULE_STRING(x) __stringify(x)
860860
861−#ifdef CONFIG_STRICT_MODULE_RWX
862−extern void module_enable_ro(const struct module *mod, bool after_init);
863−#else
864−static inline void module_enable_ro(const struct module *mod, bool after_init) { }
865−#endif
866−
867861 #ifdef CONFIG_GENERIC_BUG
868862 void module_bug_finalize(const Elf_Ehdr *, const Elf_Shdr *,
869863 struct module *);
kernel/module.c+2−1
@@ -1997,7 +1997,7 @@ static void frob_writable_data(const struct module_layout *layout, · 1996 unmodified lines
19971997 (layout->size - layout->ro_after_init_size) >> PAGE_SHIFT);
19981998 }
19991999
2000−void module_enable_ro(const struct module *mod, bool after_init)
2000+static void module_enable_ro(const struct module *mod, bool after_init)
20012001 {
20022002 if (!rodata_enabled)
20032003 return;
@@ -2025,6 +2025,7 @@ static void module_enable_nx(const struct module *mod) · 21 unmodified lines
20252025
20262026 #else /* !CONFIG_STRICT_MODULE_RWX */
20272027 static void module_enable_nx(const struct module *mod) { }
2028+static void module_enable_ro(const struct module *mod, bool after_init) {}
20282029 #endif /* CONFIG_STRICT_MODULE_RWX */
20292030 static void module_enable_x(const struct module *mod)
20302031 {