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
858 858
859#define __MODULE_STRING(x) __stringify(x)859#define __MODULE_STRING(x) __stringify(x)
860 860
861#ifdef CONFIG_STRICT_MODULE_RWX
862extern void module_enable_ro(const struct module *mod, bool after_init);
863#else
864static inline void module_enable_ro(const struct module *mod, bool after_init) { }
865#endif
866
867#ifdef CONFIG_GENERIC_BUG861#ifdef CONFIG_GENERIC_BUG
868void module_bug_finalize(const Elf_Ehdr *, const Elf_Shdr *,862void module_bug_finalize(const Elf_Ehdr *, const Elf_Shdr *,
869 struct module *);863 struct module *);
kernel/module.c+2−1
@@ -1997,7 +1997,7 @@ static void frob_writable_data(const struct module_layout *layout, · 1996 unmodified lines
1997 (layout->size - layout->ro_after_init_size) >> PAGE_SHIFT);1997 (layout->size - layout->ro_after_init_size) >> PAGE_SHIFT);
1998}1998}
1999 1999
2000void module_enable_ro(const struct module *mod, bool after_init)2000static void module_enable_ro(const struct module *mod, bool after_init)
2001{2001{
2002 if (!rodata_enabled)2002 if (!rodata_enabled)
2003 return;2003 return;
@@ -2025,6 +2025,7 @@ static void module_enable_nx(const struct module *mod) · 21 unmodified lines
2025 2025
2026#else /* !CONFIG_STRICT_MODULE_RWX */2026#else /* !CONFIG_STRICT_MODULE_RWX */
2027static void module_enable_nx(const struct module *mod) { }2027static void module_enable_nx(const struct module *mod) { }
2028static void module_enable_ro(const struct module *mod, bool after_init) {}
2028#endif /* CONFIG_STRICT_MODULE_RWX */2029#endif /* CONFIG_STRICT_MODULE_RWX */
2029static void module_enable_x(const struct module *mod)2030static void module_enable_x(const struct module *mod)
2030{2031{