lkml.org 
[lkml]   [2021]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 36/37] ia64: tools: remove duplicate definition of ia64_mf() on ia64
    Date
    From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

    [ Upstream commit f4bf09dc3aaa4b07cd15630f2023f68cb2668809 ]

    The ia64_mf() macro defined in tools/arch/ia64/include/asm/barrier.h is
    already defined in <asm/gcc_intrin.h> on ia64 which causes libbpf
    failing to build:

    CC /usr/src/linux/tools/bpf/bpftool//libbpf/staticobjs/libbpf.o
    In file included from /usr/src/linux/tools/include/asm/barrier.h:24,
    from /usr/src/linux/tools/include/linux/ring_buffer.h:4,
    from libbpf.c:37:
    /usr/src/linux/tools/include/asm/../../arch/ia64/include/asm/barrier.h:43: error: "ia64_mf" redefined [-Werror]
    43 | #define ia64_mf() asm volatile ("mf" ::: "memory")
    |
    In file included from /usr/include/ia64-linux-gnu/asm/intrinsics.h:20,
    from /usr/include/ia64-linux-gnu/asm/swab.h:11,
    from /usr/include/linux/swab.h:8,
    from /usr/include/linux/byteorder/little_endian.h:13,
    from /usr/include/ia64-linux-gnu/asm/byteorder.h:5,
    from /usr/src/linux/tools/include/uapi/linux/perf_event.h:20,
    from libbpf.c:36:
    /usr/include/ia64-linux-gnu/asm/gcc_intrin.h:382: note: this is the location of the previous definition
    382 | #define ia64_mf() __asm__ volatile ("mf" ::: "memory")
    |
    cc1: all warnings being treated as errors

    Thus, remove the definition from tools/arch/ia64/include/asm/barrier.h.

    Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/arch/ia64/include/asm/barrier.h | 3 ---
    1 file changed, 3 deletions(-)

    diff --git a/tools/arch/ia64/include/asm/barrier.h b/tools/arch/ia64/include/asm/barrier.h
    index e4422b4b634e..94ae4a333a35 100644
    --- a/tools/arch/ia64/include/asm/barrier.h
    +++ b/tools/arch/ia64/include/asm/barrier.h
    @@ -38,9 +38,6 @@
    * sequential memory pages only.
    */

    -/* XXX From arch/ia64/include/uapi/asm/gcc_intrin.h */
    -#define ia64_mf() asm volatile ("mf" ::: "memory")
    -
    #define mb() ia64_mf()
    #define rmb() mb()
    #define wmb() mb()
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-04-26 09:36    [W:2.577 / U:0.900 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site