From: Mark Brown <broonie@linaro.org>
Date: Thu, 29 May 2014 15:02:15 +0000 (+0100)
Subject: arm64: Add __ASSEMBLY__ guards to insn.h
X-Git-Tag: firefly_0821_release~3680^2~36^2~52^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d10fbc12d0c4c6e872de2a342b88b896e430cea3;p=firefly-linux-kernel-4.4.55.git

arm64: Add __ASSEMBLY__ guards to insn.h

Signed-off-by: Mark Brown <broonie@linaro.org>
---

diff --git a/arch/arm64/include/asm/insn.h b/arch/arm64/include/asm/insn.h
index c44ad39ed310..62e7b8bcd2dc 100644
--- a/arch/arm64/include/asm/insn.h
+++ b/arch/arm64/include/asm/insn.h
@@ -16,11 +16,14 @@
  */
 #ifndef	__ASM_INSN_H
 #define	__ASM_INSN_H
+
 #include <linux/types.h>
 
 /* 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":
@@ -105,4 +108,6 @@ 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 */