Commit 00699e84 authored by akpm@linux-foundation.org's avatar akpm@linux-foundation.org Committed by Linus Torvalds

uml: fix WARNING: vmlinux: 'memcpy' exported twice

Fix the following warning on x86_64:

LD vmlinux.o
MODPOST vmlinux.o
WARNING: vmlinux: 'memcpy' exported twice. Previous export was in vmlinux

For x86_64, this symbol is already exported from arch/um/sys-x86_64/ksyms.c.
Reported-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
Signed-off-by: default avatarWANG Cong <xiyou.wangcong@gmail.com>
Tested-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 86d6f2bf
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#undef memset #undef memset
extern size_t strlen(const char *); extern size_t strlen(const char *);
extern void *memcpy(void *, const void *, size_t);
extern void *memmove(void *, const void *, size_t); extern void *memmove(void *, const void *, size_t);
extern void *memset(void *, int, size_t); extern void *memset(void *, int, size_t);
extern int printf(const char *, ...); extern int printf(const char *, ...);
...@@ -24,7 +23,11 @@ extern int printf(const char *, ...); ...@@ -24,7 +23,11 @@ extern int printf(const char *, ...);
EXPORT_SYMBOL(strstr); EXPORT_SYMBOL(strstr);
#endif #endif
#ifndef __x86_64__
extern void *memcpy(void *, const void *, size_t);
EXPORT_SYMBOL(memcpy); EXPORT_SYMBOL(memcpy);
#endif
EXPORT_SYMBOL(memmove); EXPORT_SYMBOL(memmove);
EXPORT_SYMBOL(memset); EXPORT_SYMBOL(memset);
EXPORT_SYMBOL(printf); EXPORT_SYMBOL(printf);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment