Commit e6eff437 authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Jiri Kosina
Browse files

module: Make module_enable_ro() static again 



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

Suggested-by: default avatarJessica Yu <jeyu@kernel.org>
Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Acked-by: default avatarJessica Yu <jeyu@kernel.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 5b384f93

include/linux/module.h

+0 −6
Original line number Diff line number Diff line
@@ -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 *);

kernel/module.c

+2 −1
Original line number Diff line number Diff line
@@ -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)

{