| From d5ba8a4ed5c30be4acf1b568a69108fc55debcad Mon Sep 17 00:00:00 2001 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Mon, 28 Nov 2016 15:59:13 +0100 |
| Subject: module: fix DEBUG_SET_MODULE_RONX typo |
| |
| [ Upstream commit 4d217a5adccf5e806790c37c61cc374a08bd7381 ] |
| |
| The newly added 'rodata_enabled' global variable is protected by |
| the wrong #ifdef, leading to a link error when CONFIG_DEBUG_SET_MODULE_RONX |
| is turned on: |
| |
| kernel/module.o: In function `disable_ro_nx': |
| module.c:(.text.unlikely.disable_ro_nx+0x88): undefined reference to `rodata_enabled' |
| kernel/module.o: In function `module_disable_ro': |
| module.c:(.text.module_disable_ro+0x8c): undefined reference to `rodata_enabled' |
| kernel/module.o: In function `module_enable_ro': |
| module.c:(.text.module_enable_ro+0xb0): undefined reference to `rodata_enabled' |
| |
| CONFIG_SET_MODULE_RONX does not exist, so use the correct one instead. |
| |
| Fixes: 39290b389ea2 ("module: extend 'rodata=off' boot cmdline parameter to module mappings") |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Jessica Yu <jeyu@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| init/main.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/init/main.c b/init/main.c |
| index 4313772d634a..3c7f71d8e704 100644 |
| --- a/init/main.c |
| +++ b/init/main.c |
| @@ -915,7 +915,7 @@ static int try_to_run_init_process(const char *init_filename) |
| |
| static noinline void __init kernel_init_freeable(void); |
| |
| -#if defined(CONFIG_DEBUG_RODATA) || defined(CONFIG_SET_MODULE_RONX) |
| +#if defined(CONFIG_DEBUG_RODATA) || defined(CONFIG_DEBUG_SET_MODULE_RONX) |
| bool rodata_enabled __ro_after_init = true; |
| static int __init set_debug_rodata(char *str) |
| { |
| -- |
| 2.17.1 |
| |
