diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2019-08-26 11:59:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-08-26 11:59:57 +0200 |
| commit | 8db5957bc736f0fcbe187ab460e5448d82b41c03 (patch) | |
| tree | 070b560282ddc4a9a86018ccc59b888b6347ece0 /kernel/module.c | |
| parent | Merge tag 'perf-core-for-mingo-5.4-20190822' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core (diff) | |
| parent | Linux 5.3-rc6 (diff) | |
| download | linux-dev-8db5957bc736f0fcbe187ab460e5448d82b41c03.tar.xz linux-dev-8db5957bc736f0fcbe187ab460e5448d82b41c03.zip | |
Merge tag 'v5.3-rc6' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/module.c')
| -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) |