lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 1055/1157] csky: abiv1: Fixup compile error
    Date
    From: Guo Ren <guoren@linux.alibaba.com>

    commit 45fef4c4b9c94e86d9c13f0b2e7e71bb32254509 upstream.

    LD vmlinux.o
    arch/csky/lib/string.o: In function `memmove':
    string.c:(.text+0x108): multiple definition of `memmove'
    lib/string.o:string.c:(.text+0x7e8): first defined here
    arch/csky/lib/string.o: In function `memset':
    string.c:(.text+0x148): multiple definition of `memset'
    lib/string.o:string.c:(.text+0x2ac): first defined here
    scripts/Makefile.vmlinux_o:68: recipe for target 'vmlinux.o' failed
    make[4]: *** [vmlinux.o] Error 1

    Fixes: e4df2d5e852a ("csky: Add C based string functions")
    Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
    Signed-off-by: Guo Ren <guoren@kernel.org>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/csky/abiv1/inc/abi/string.h | 6 ++++++
    1 file changed, 6 insertions(+)

    diff --git a/arch/csky/abiv1/inc/abi/string.h b/arch/csky/abiv1/inc/abi/string.h
    index 9d95594b0feb..de50117b904d 100644
    --- a/arch/csky/abiv1/inc/abi/string.h
    +++ b/arch/csky/abiv1/inc/abi/string.h
    @@ -6,4 +6,10 @@
    #define __HAVE_ARCH_MEMCPY
    extern void *memcpy(void *, const void *, __kernel_size_t);

    +#define __HAVE_ARCH_MEMMOVE
    +extern void *memmove(void *, const void *, __kernel_size_t);
    +
    +#define __HAVE_ARCH_MEMSET
    +extern void *memset(void *, int, __kernel_size_t);
    +
    #endif /* __ABI_CSKY_STRING_H */
    --
    2.37.2


    \
     
     \ /
      Last update: 2022-09-17 16:27    [W:4.058 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site