Commit 315df9c4 authored by Christophe Leroy's avatar Christophe Leroy Committed by Luis Chamberlain
Browse files

modules: Remove #ifdef CONFIG_STRICT_MODULE_RWX around rodata_enabled 



Now that rodata_enabled is declared at all time, the #ifdef
CONFIG_STRICT_MODULE_RWX can be removed.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent 398ec3e9

kernel/module/strict_rwx.c

+1 −5
Original line number Diff line number Diff line
@@ -38,12 +38,8 @@ void module_enable_text_rox(const struct module *mod) 


void module_enable_rodata_ro(const struct module *mod, bool after_init)

{

	if (!IS_ENABLED(CONFIG_STRICT_MODULE_RWX))

		return;

#ifdef CONFIG_STRICT_MODULE_RWX

	if (!rodata_enabled)

	if (!IS_ENABLED(CONFIG_STRICT_MODULE_RWX) || !rodata_enabled)

		return;

#endif



	module_set_memory(mod, MOD_RODATA, set_memory_ro);

	module_set_memory(mod, MOD_INIT_RODATA, set_memory_ro);