diff options
| author | Jeff Dike <jdike@addtoit.com> | 2008-08-05 16:14:09 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-20 11:15:38 -0700 |
| commit | 4b09fd1b359a42f910881feca140ae0bf3efb28e (patch) | |
| tree | b0f57ea6d519f347513ca09320fb581689c37e7f /arch | |
| parent | 2babd2d9bbac17d4407d0592a2eee7db18278f00 (diff) | |
uml: memcpy export needs to follow host declaration
commit 8bfd04b974689f700bbd053ad6e66b0a95fb80c9 upstream
x86_64 defines either memcpy or __memcpy depending on the gcc version, and
it looks like UML needs to follow that in its exporting.
Cc: Gabriel C <nix.or.die@googlemail.com>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/sys-x86_64/ksyms.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/um/sys-x86_64/ksyms.c b/arch/um/sys-x86_64/ksyms.c index 08f63e2dcdcc..467879add804 100644 --- a/arch/um/sys-x86_64/ksyms.c +++ b/arch/um/sys-x86_64/ksyms.c @@ -13,5 +13,9 @@ EXPORT_SYMBOL(__down_failed_trylock); EXPORT_SYMBOL(__up_wakeup); /*XXX: we need them because they would be exported by x86_64 */ +#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4 +EXPORT_SYMBOL(memcpy); +#else EXPORT_SYMBOL(__memcpy); +#endif EXPORT_SYMBOL(csum_partial); |