diff options
| author | Linus Torvalds | 2019-08-23 09:22:00 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2019-08-23 09:22:00 -0700 |
| commit | e3fb13b7e47cd18b2bd067ea8a491020b4644baf (patch) | |
| tree | 7ff6b8ef041196b10ef6a92bbdc593571dfd0962 | |
| parent | 4e5639449069d12e95edc10b63acf170843e1706 (diff) | |
| parent | 3b5be16c7e90a69c93349d210766250fffcb54bd (diff) | |
Merge tag 'modules-for-v5.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux
Pull modules fixes from Jessica Yu:
"Fix BUG_ON() being triggered in frob_text() due to non-page-aligned
module sections"
* tag 'modules-for-v5.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
modules: page-align module section allocations only for arches supporting strict module rwx
modules: always page-align module section allocations
| -rw-r--r-- | kernel/module.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/module.c b/kernel/module.c index 5933395af9a0..9ee93421269c 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -65,9 +65,9 @@ /* * Modules' sections will be aligned on page boundaries * to ensure complete separation of code and data, but - * only when CONFIG_STRICT_MODULE_RWX=y + * only when CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y */ -#ifdef CONFIG_STRICT_MODULE_RWX +#ifdef CONFIG_ARCH_HAS_STRICT_MODULE_RWX # define debug_align(X) ALIGN(X, PAGE_SIZE) #else # define debug_align(X) (X) |