From 925eef87eed96656b2cb2f72b16e03877cbb37f7 Mon Sep 17 00:00:00 2001 From: "akpm@linux-foundation.org" Date: Thu, 12 Mar 2009 14:31:24 -0700 Subject: [PATCH] --- yaml --- r: 132221 b: refs/heads/master c: 00699e8472cc0209d57b5c5614bc2ec98e665004 h: refs/heads/master i: 132219: 533234a3cee45b679425529e59a95a44ccb5236f v: v3 --- [refs] | 2 +- trunk/arch/um/os-Linux/user_syms.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c24f0e9c06ed..dc52674f6e5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86d6f2bf61eb2a28fa63c0a19330d36226426477 +refs/heads/master: 00699e8472cc0209d57b5c5614bc2ec98e665004 diff --git a/trunk/arch/um/os-Linux/user_syms.c b/trunk/arch/um/os-Linux/user_syms.c index 74f49bb9b125..89b48a116a89 100644 --- a/trunk/arch/um/os-Linux/user_syms.c +++ b/trunk/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);