summaryrefslogtreecommitdiff
path: root/arch/arm64/kernel/patching.c
diff options
context:
space:
mode:
authorMark Rutland <mark.rutland@arm.com>2021-06-09 13:23:00 +0300
committerWill Deacon <will@kernel.org>2021-06-11 13:19:27 +0300
commit78b92c7337e10519312e8aab64d7a1651206bd61 (patch)
treef8ab051cfc991c14899398c2c5e72d6fccc60aaa /arch/arm64/kernel/patching.c
parent71766b81de8204a0fb56de3ad1972516bac99f5b (diff)
downloadlinux-78b92c7337e10519312e8aab64d7a1651206bd61.tar.xz
arm64: insn: decouple patching from insn code
Currently, <asm/insn.h> includes <asm/patching.h>. We intend that <asm/insn.h> will be usable from userspace, so it doesn't make sense to include headers for kernel-only features such as the patching routines, and we'd intended to restrict <asm/insn.h> to instruction encoding details. Let's decouple the patching code from <asm/insn.h>, and explicitly include <asm/patching.h> where it is needed. Since <asm/patching.h> isn't included from assembly, we can drop the __ASSEMBLY__ guards. At the same time, sort the kprobes includes so that it's easier to see what is and isn't incldued. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Link: https://lore.kernel.org/r/20210609102301.17332-2-mark.rutland@arm.com Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/patching.c')
-rw-r--r--arch/arm64/kernel/patching.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/patching.c b/arch/arm64/kernel/patching.c
index 9d050e33901b..7aa55b33c8c7 100644
--- a/arch/arm64/kernel/patching.c
+++ b/arch/arm64/kernel/patching.c
@@ -9,6 +9,7 @@
#include <asm/cacheflush.h>
#include <asm/fixmap.h>
#include <asm/kprobes.h>
+#include <asm/patching.h>
#include <asm/sections.h>
static DEFINE_RAW_SPINLOCK(patch_lock);