diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2021-06-09 11:23:00 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2021-06-11 11:19:27 +0100 |
| commit | 78b92c7337e10519312e8aab64d7a1651206bd61 (patch) | |
| tree | f8ab051cfc991c14899398c2c5e72d6fccc60aaa /arch/arm64/include/asm/patching.h | |
| parent | 71766b81de8204a0fb56de3ad1972516bac99f5b (diff) | |
| download | linux-stable-78b92c7337e10519312e8aab64d7a1651206bd61.tar.gz linux-stable-78b92c7337e10519312e8aab64d7a1651206bd61.tar.bz2 linux-stable-78b92c7337e10519312e8aab64d7a1651206bd61.zip | |
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/include/asm/patching.h')
| -rw-r--r-- | arch/arm64/include/asm/patching.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/patching.h b/arch/arm64/include/asm/patching.h index 5ebab129222f..6bf5adc56295 100644 --- a/arch/arm64/include/asm/patching.h +++ b/arch/arm64/include/asm/patching.h @@ -4,12 +4,10 @@ #include <linux/types.h> -#ifndef __ASSEMBLY__ int aarch64_insn_read(void *addr, u32 *insnp); int aarch64_insn_write(void *addr, u32 insn); int aarch64_insn_patch_text_nosync(void *addr, u32 insn); int aarch64_insn_patch_text(void *addrs[], u32 insns[], int cnt); -#endif /* __ASSEMBLY__ */ #endif /* __ASM_PATCHING_H */ |