diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-04-08 14:28:13 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-04-08 14:28:13 -0700 |
| commit | fd74ea65883c7e6903e9b652795f72b723a2be69 (patch) | |
| tree | 0792ad598080eae201d2836ac3c5a8fc46d0d03e /arch/um/os-Linux | |
| parent | c8f517c444e4f9f55b5b5ca202b8404691a35805 (diff) | |
| parent | 8c6db1bbf80123839ec87bdd6cb364aea384623d (diff) | |
| download | kernel_samsung_smdk4412-fd74ea65883c7e6903e9b652795f72b723a2be69.zip kernel_samsung_smdk4412-fd74ea65883c7e6903e9b652795f72b723a2be69.tar.gz kernel_samsung_smdk4412-fd74ea65883c7e6903e9b652795f72b723a2be69.tar.bz2 | |
Merge branch 'dmaengine' into async-tx-raid6
Diffstat (limited to 'arch/um/os-Linux')
| -rw-r--r-- | arch/um/os-Linux/user_syms.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/um/os-Linux/user_syms.c b/arch/um/os-Linux/user_syms.c index 74f49bb..89b48a1 100644 --- a/arch/um/os-Linux/user_syms.c +++ b/arch/um/os-Linux/user_syms.c @@ -14,7 +14,6 @@ #undef memset extern size_t strlen(const char *); -extern void *memcpy(void *, const void *, size_t); extern void *memmove(void *, const void *, size_t); extern void *memset(void *, int, size_t); extern int printf(const char *, ...); @@ -24,7 +23,11 @@ extern int printf(const char *, ...); EXPORT_SYMBOL(strstr); #endif +#ifndef __x86_64__ +extern void *memcpy(void *, const void *, size_t); EXPORT_SYMBOL(memcpy); +#endif + EXPORT_SYMBOL(memmove); EXPORT_SYMBOL(memset); EXPORT_SYMBOL(printf); |