aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Pundir <amit.pundir@linaro.org>2015-02-23 11:11:46 +0530
committerMark Brown <broonie@kernel.org>2015-02-23 22:13:53 +0900
commit32e0d718cd463976a780a21749833851b33bcdbb (patch)
treea66d07dccb70ba5408406d6deba040ef3c5f50e6
parent71e929951faaeeeab8d2a046e46152181c6e9baa (diff)
downloadlinux-linaro-stable-v3.14/topic/aosp.tar.gz
arm64: android: Move ARMv8 deprecated instructions under __ASSEMBLY__ guardsv3.14/topic/aosp
Move recently added ARMV8 deprecated instructions under __ASSEMBLY_ guards in insn.h, otherwise we run into following build error if FUNCTION_TRACER is enabled: -----8<----- arch/arm64/include/asm/insn.h:113: Error: unknown mnemonic `bool' -- `bool aarch32_insn_is_wide(u32 insn)' arch/arm64/include/asm/insn.h:119: Error: unknown mnemonic `u32' -- `u32 aarch32_insn_extract_reg_num(u32 insn,int offset)' arch/arm64/include/asm/insn.h:120: Error: unknown mnemonic `u32' -- `u32 aarch32_insn_mcr_extract_opc2(u32 insn)' arch/arm64/include/asm/insn.h:121: Error: unknown mnemonic `u32' -- `u32 aarch32_insn_mcr_extract_crm(u32 insn)' make[3]: *** [arch/arm64/kernel/entry-ftrace.o] Error 1 ----->8----- Signed-off-by: Amit Pundir <amit.pundir@linaro.org> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--arch/arm64/include/asm/insn.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/insn.h b/arch/arm64/include/asm/insn.h
index e97498c0c865..432310ab0731 100644
--- a/arch/arm64/include/asm/insn.h
+++ b/arch/arm64/include/asm/insn.h
@@ -115,4 +115,6 @@ u32 aarch32_insn_extract_reg_num(u32 insn, int offset);
u32 aarch32_insn_mcr_extract_opc2(u32 insn);
u32 aarch32_insn_mcr_extract_crm(u32 insn);
+#endif /* __ASSEMBLY__ */
+
#endif /* __ASM_INSN_H */