lkml.org 
[lkml]   [2014]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 1/7] arm64: add __ASSEMBLY__ in asm/insn.h
    Date
    Since insn.h is indirectly included in asm/entry-ftrace.S,
    we need to exclude some declarations by __ASSEMBLY__.

    Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
    ---
    arch/arm64/include/asm/insn.h | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/arch/arm64/include/asm/insn.h b/arch/arm64/include/asm/insn.h
    index c44ad39..dc1f73b 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 */
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2014-03-14 02:01    [W:4.232 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site