diff options
| author | Guo Ren <guoren@linux.alibaba.com> | 2022-08-01 04:34:24 +0200 |
|---|---|---|
| committer | Guo Ren <guoren@linux.alibaba.com> | 2022-08-01 04:39:23 +0200 |
| commit | 45fef4c4b9c94e86d9c13f0b2e7e71bb32254509 (patch) | |
| tree | d3f769ac34b18f724b575934a65086ba6a887056 | |
| parent | csky: cmpxchg: Coding convention for BUILD_BUG() (diff) | |
| download | linux-45fef4c4b9c94e86d9c13f0b2e7e71bb32254509.tar.xz linux-45fef4c4b9c94e86d9c13f0b2e7e71bb32254509.zip | |
csky: abiv1: Fixup compile error
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>
| -rw-r--r-- | arch/csky/abiv1/inc/abi/string.h | 6 |
1 files changed, 6 insertions, 0 deletions
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 */ |