summaryrefslogtreecommitdiffstats
path: root/kernel/module.c
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2017-07-06 15:35:58 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-06 16:24:30 -0700
commit563ec5cbc615698239c3a63511b939a7a7e38870 (patch)
tree54be3acc3f9e963075ae2983a5af1c13ad9728f1 /kernel/module.c
parent61f6d09a931c3ab216f43e00505073088d387d05 (diff)
downloadlinux-stable-563ec5cbc615698239c3a63511b939a7a7e38870.tar.gz
linux-stable-563ec5cbc615698239c3a63511b939a7a7e38870.tar.bz2
linux-stable-563ec5cbc615698239c3a63511b939a7a7e38870.zip
kernel/module.c: use linux/set_memory.h
This header always exists, so doesn't require an ifdef around its inclusion. When CONFIG_ARCH_HAS_SET_MEMORY=y it includes the asm header, otherwise it provides empty versions of the set_memory_xx() routines. The usages of set_memory_xx() are still guarded by CONFIG_STRICT_MODULE_RWX. Link: http://lkml.kernel.org/r/1498717781-29151-3-git-send-email-mpe@ellerman.id.au Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Acked-by: Kees Cook <keescook@chromium.org> Acked-by: Laura Abbott <labbott@redhat.com> Cc: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/module.c')
-rw-r--r--kernel/module.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/module.c b/kernel/module.c
index d7eb41d772c4..8f883d86cedc 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -49,9 +49,7 @@
#include <linux/rculist.h>
#include <linux/uaccess.h>
#include <asm/cacheflush.h>
-#ifdef CONFIG_STRICT_MODULE_RWX
-#include <asm/set_memory.h>
-#endif
+#include <linux/set_memory.h>
#include <asm/mmu_context.h>
#include <linux/license.h>
#include <asm/sections.h>