diff options
| author | Jeff Dike <jdike@addtoit.com> | 2008-06-05 22:46:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-06 11:29:10 -0700 |
| commit | 8bfd04b974689f700bbd053ad6e66b0a95fb80c9 (patch) | |
| tree | 0c5ecd6c9e24c0fe1ce62ff88c549d200a33b5d0 /arch/um | |
| parent | 40fb16a360d9c6459afee91dc793c1e3374feb94 (diff) | |
| download | op-kernel-dev-8bfd04b974689f700bbd053ad6e66b0a95fb80c9.zip op-kernel-dev-8bfd04b974689f700bbd053ad6e66b0a95fb80c9.tar.gz | |
uml: memcpy export needs to follow host declaration
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>
Diffstat (limited to 'arch/um')
| -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 6604673..1db2fce 100644 --- a/arch/um/sys-x86_64/ksyms.c +++ b/arch/um/sys-x86_64/ksyms.c @@ -3,5 +3,9 @@ #include <asm/checksum.h> /*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); |
