diff options
| author | AKASHI Takahiro <takahiro.akashi@linaro.org> | 2014-04-30 11:54:30 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2014-05-29 10:04:31 +0200 |
| commit | 26e9b83a7d3e9dbe276301b637f65321bdd0939b (patch) | |
| tree | 19aee72866e30f2f5b21826b8def8d5dee09e17a | |
| parent | Merge branch 'ftrace/arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-26e9b83a7d3e9dbe276301b637f65321bdd0939b.tar.xz linux-26e9b83a7d3e9dbe276301b637f65321bdd0939b.zip | |
arm64: add __ASSEMBLY__ in asm/insn.h
Since insn.h is indirectly included in asm/entry-ftrace.S,
we need to exclude some declarations by __ASSEMBLY__.
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
| -rw-r--r-- | arch/arm64/include/asm/insn.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/insn.h b/arch/arm64/include/asm/insn.h index c44ad39ed310..dc1f73b13e74 100644 --- a/arch/arm64/include/asm/insn.h +++ b/arch/arm64/include/asm/insn.h @@ -21,6 +21,7 @@ /* A64 instructions are always 32 bits. */ #define AARCH64_INSN_SIZE 4 +#ifndef __ASSEMBLY__ /* * ARM Architecture Reference Manual for ARMv8 Profile-A, Issue A.a * Section C3.1 "A64 instruction index by encoding": @@ -104,5 +105,6 @@ bool aarch64_insn_hotpatch_safe(u32 old_insn, u32 new_insn); int aarch64_insn_patch_text_nosync(void *addr, u32 insn); int aarch64_insn_patch_text_sync(void *addrs[], u32 insns[], int cnt); int aarch64_insn_patch_text(void *addrs[], u32 insns[], int cnt); +#endif /* __ASSEMBLY__ */ #endif /* __ASM_INSN_H */ |