arm64: add __ASSEMBLY__ in asm/insn.h
authorAKASHI Takahiro <takahiro.akashi@linaro.org>
Wed, 30 Apr 2014 09:54:30 +0000 (10:54 +0100)
committerWill Deacon <will.deacon@arm.com>
Thu, 29 May 2014 08:04:31 +0000 (09:04 +0100)
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>
arch/arm64/include/asm/insn.h

index c44ad39ed3107859a9bb8c7e7115dbc146825f47..dc1f73b13e740d83b399233fc53b6414f10aab41 100644 (file)
@@ -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 */